openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: tegra: Device tree changes for v4.9-rc1 

Contains a couple of cleanups for Tegra114 device trees.
 -----BEGIN PGP SIGNATURE-----
 
 iQIwBAABCAAaBQJX0tEvExx0cmVkaW5nQG52aWRpYS5jb20ACgkQ3SOs138+s6EL
 oxAApNxkPaZJdkbJ5W1NE/laLuXANEV2KCGIqY0li7/WBDwvypjcPb851/ZsFqJG
 pcLej2bZ6hvMUztAikiO0Re2fnlLwujPY0grbQbLUkkUDeekh+iqbLC57a7ENo+N
 sag7avHlMBSzx2tUFCII+Wy+TLdSNd2S6zlh7DRWYYeCticjWTI9BL6oAqwQ0fG4
 2AM2JbHZwSo3cqb3UJnHQFpwyuwx6aiuJpsx+R3o1AR2uyfMJjW5KqCF0ujG2RDU
 FKf354FP2d86B40q+3c8ipWMjtER3aP5AUJHpYtIiC+HVJJnEgo/hVrc88PvfHcb
 dm55mM/eZyA5hRKUfDBF2hFU2oQx5m9t8+weAX82YQYMArQF1TEbhPGWNv+rPQZh
 eTxTxKGgkDN7sWwsd51jgJXt+cIlJOwbI2xcTINKpBOJKrQcaRr7YsF1jwcXSKzw
 BUAUxhzHho4oOiuP63ZwHrHU5DG9vw8AB+eySrbQ8O7BTKqq2MrKFiO/NR1zz0ea
 nyMwjmduqYKT6nmeyRLe1F4BbwteMO82dCSCEyE7wRXOnAbFHwHFvQ/gRImQgMpY
 TsxA929hNiqZKjMEpj35sazbRAo/VHkeBD/B5VvZcNbvzGGtqYc/5dPNB2ttf7Qt
 FG7At8GEiLuNBe5JRceCIXaNSqrfChel7T6RqvQfkUKP+Po=
 =K9Kg
 -----END PGP SIGNATURE-----

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

Pull "ARM: tegra: Device tree changes for v4.9-rc1" from Thierry Reding:

Contains a couple of cleanups for Tegra114 device trees.

* tag 'tegra-for-4.9-arm-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  ARM: tegra: Correct polarity for Tegra114 PMIC interrupt
  ARM: tegra: Fix Tegra114 USB compatible values
This commit is contained in:
Arnd Bergmann 2016-09-13 17:40:17 +02:00
parent 1f480960e0 7e9d474954
commit 83a9660af6
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/tegra114-dalmore.dts
View File

@ -897,7 +897,7 @@ ldo2 {
palmas: tps65913@58 {
compatible = "ti,palmas";
reg = <0x58>;
interrupts = <0 86 IRQ_TYPE_LEVEL_LOW>;
interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>;
#interrupt-cells = <2>;
interrupt-controller;

2
arch/arm/boot/dts/tegra114-roth.dts
View File

@ -802,7 +802,7 @@ regulator@43 {
palmas: pmic@58 {
compatible = "ti,palmas";
reg = <0x58>;
interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_LOW>;
interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
#interrupt-cells = <2>;
interrupt-controller;

2
arch/arm/boot/dts/tegra114-tn7.dts
View File

@ -63,7 +63,7 @@ i2c@7000d000 {
palmas: pmic@58 {
compatible = "ti,palmas";
reg = <0x58>;
interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_LOW>;
interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>;
#interrupt-cells = <2>;
interrupt-controller;

8
arch/arm/boot/dts/tegra114.dtsi
View File

@ -672,7 +672,7 @@ sdhci@78000600 {
};
usb@7d000000 {
compatible = "nvidia,tegra30-ehci", "usb-ehci";
compatible = "nvidia,tegra114-ehci", "nvidia,tegra30-ehci", "usb-ehci";
reg = <0x7d000000 0x4000>;
interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
phy_type = "utmi";
@ -684,7 +684,7 @@ usb@7d000000 {
};
phy1: usb-phy@7d000000 {
compatible = "nvidia,tegra30-usb-phy";
compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x7d000000 0x4000 0x7d000000 0x4000>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA114_CLK_USBD>,
@ -708,7 +708,7 @@ phy1: usb-phy@7d000000 {
};
usb@7d008000 {
compatible = "nvidia,tegra30-ehci", "usb-ehci";
compatible = "nvidia,tegra114-ehci", "nvidia,tegra30-ehci", "usb-ehci";
reg = <0x7d008000 0x4000>;
interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
phy_type = "utmi";
@ -720,7 +720,7 @@ usb@7d008000 {
};
phy3: usb-phy@7d008000 {
compatible = "nvidia,tegra30-usb-phy";
compatible = "nvidia,tegra114-usb-phy", "nvidia,tegra30-usb-phy";
reg = <0x7d008000 0x4000 0x7d000000 0x4000>;
phy_type = "utmi";
clocks = <&tegra_car TEGRA114_CLK_USB3>,