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 'locking-urgent-2020-12-27' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git]
/
arch
/
arm
/
boot
/
dts
/
lpc32xx.dtsi
diff --git
a/arch/arm/boot/dts/lpc32xx.dtsi
b/arch/arm/boot/dts/lpc32xx.dtsi
index
7b7ec7b
..
3a5cfb0
100644
(file)
--- a/
arch/arm/boot/dts/lpc32xx.dtsi
+++ b/
arch/arm/boot/dts/lpc32xx.dtsi
@@
-123,7
+123,6
@@
clocks = <&usbclk LPC32XX_USB_CLK_I2C>;
#address-cells = <1>;
#size-cells = <0>;
clocks = <&usbclk LPC32XX_USB_CLK_I2C>;
#address-cells = <1>;
#size-cells = <0>;
- pnx,timeout = <0x64>;
};
usbclk: clock-controller@f00 {
};
usbclk: clock-controller@f00 {
@@
-286,7
+285,6
@@
interrupts = <19 IRQ_TYPE_LEVEL_LOW>;
#address-cells = <1>;
#size-cells = <0>;
interrupts = <19 IRQ_TYPE_LEVEL_LOW>;
#address-cells = <1>;
#size-cells = <0>;
- pnx,timeout = <0x64>;
clocks = <&clk LPC32XX_CLK_I2C1>;
};
clocks = <&clk LPC32XX_CLK_I2C1>;
};
@@
-297,7
+295,6
@@
interrupts = <18 IRQ_TYPE_LEVEL_LOW>;
#address-cells = <1>;
#size-cells = <0>;
interrupts = <18 IRQ_TYPE_LEVEL_LOW>;
#address-cells = <1>;
#size-cells = <0>;
- pnx,timeout = <0x64>;
clocks = <&clk LPC32XX_CLK_I2C2>;
};
clocks = <&clk LPC32XX_CLK_I2C2>;
};