projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'livepatching-for-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git...
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
tegra30-ouya.dts
diff --git
a/arch/arm/boot/dts/tegra30-ouya.dts
b/arch/arm/boot/dts/tegra30-ouya.dts
index
ab8744f
..
90db5ff
100644
(file)
--- a/
arch/arm/boot/dts/tegra30-ouya.dts
+++ b/
arch/arm/boot/dts/tegra30-ouya.dts
@@
-124,12
+124,11
@@
compatible = "onnn,nct1008";
reg = <0x4c>;
vcc-supply = <&sys_3v3_reg>;
compatible = "onnn,nct1008";
reg = <0x4c>;
vcc-supply = <&sys_3v3_reg>;
+
+ interrupt-parent = <&gpio>;
+ interrupts = <TEGRA_GPIO(CC, 2) IRQ_TYPE_EDGE_FALLING>;
+
#thermal-sensor-cells = <1>;
#thermal-sensor-cells = <1>;
-/*
- * The interrupt is bugged, once triggered it never clears.
- * interrupt-parent = <&gpio>;
- * interrupts = <TEGRA_GPIO(CC, 2) IRQ_TYPE_LEVEL_LOW>;
- */
};
pmic: pmic@2d {
};
pmic: pmic@2d {
@@
-4376,8
+4375,8
@@
nvidia,pins = "pcc2";
nvidia,function = "i2s4";
nvidia,pull = <TEGRA_PIN_PULL_NONE>;
nvidia,pins = "pcc2";
nvidia,function = "i2s4";
nvidia,pull = <TEGRA_PIN_PULL_NONE>;
- nvidia,tristate = <TEGRA_PIN_
EN
ABLE>;
- nvidia,enable-input = <TEGRA_PIN_
DIS
ABLE>;
+ nvidia,tristate = <TEGRA_PIN_
DIS
ABLE>;
+ nvidia,enable-input = <TEGRA_PIN_
EN
ABLE>;
};
sdmmc4_rst_n_pcc3 {
nvidia,pins = "sdmmc4_rst_n_pcc3";
};
sdmmc4_rst_n_pcc3 {
nvidia,pins = "sdmmc4_rst_n_pcc3";