git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
r8a7790.dtsi
diff --git
a/arch/arm/boot/dts/r8a7790.dtsi
b/arch/arm/boot/dts/r8a7790.dtsi
index dc8497b1558677eaddd57ea2321f8400cd429e32..83cf23cd26bb51e6632cffb9e87a12cdc2ea442f 100644
(file)
--- a/
arch/arm/boot/dts/r8a7790.dtsi
+++ b/
arch/arm/boot/dts/r8a7790.dtsi
@@
-1043,8
+1043,7
@@
pcie_bus_clk: pcie_bus {
compatible = "fixed-clock";
#clock-cells = <0>;
pcie_bus_clk: pcie_bus {
compatible = "fixed-clock";
#clock-cells = <0>;
- clock-frequency = <100000000>;
- status = "disabled";
+ clock-frequency = <0>;
};
/*
};
/*
@@
-1073,7
+1072,6
@@
#clock-cells = <0>;
/* This value must be overridden by the board. */
clock-frequency = <0>;
#clock-cells = <0>;
/* This value must be overridden by the board. */
clock-frequency = <0>;
- status = "disabled";
};
/* External USB clock - can be overridden by the board */
};
/* External USB clock - can be overridden by the board */
@@
-1089,7
+1087,6
@@
#clock-cells = <0>;
/* This value must be overridden by the board. */
clock-frequency = <0>;
#clock-cells = <0>;
/* This value must be overridden by the board. */
clock-frequency = <0>;
- status = "disabled";
};
/* Special CPG clocks */
};
/* Special CPG clocks */