diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-04-28 16:50:31 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2016-04-28 16:50:31 +0300 |
| commit | a050ebb01443d1f4f6502bb49cd1cbe769c8fa6f (patch) | |
| tree | a030f0c182b3c382f101c7bb0ed413451e573fd5 /arch | |
| parent | 0d6cde5093288749be2981cbdebb0125db572e2f (diff) | |
| parent | c9006ac628ca30dd0d06dad47677d338e243bb95 (diff) | |
| download | linux-a050ebb01443d1f4f6502bb49cd1cbe769c8fa6f.tar.xz | |
Merge tag 'renesas-dt2-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt
Merge "Second Round of Renesas ARM Based SoC DT Updates for v4.7" from Simon Horman
* Don't disable referenced optional clocks in DT of R-Car Gen 1 & 2 SoCs
* tag 'renesas-dt2-for-v4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: dts: r8a7794: Don't disable referenced optional clocks
ARM: dts: r8a7793: Don't disable referenced optional clocks
ARM: dts: r8a7790: Don't disable referenced optional clocks
ARM: dts: r8a7779: Don't disable referenced optional clocks
ARM: dts: r8a7778: Don't disable referenced optional clocks
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/r8a7778.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/r8a7779.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/r8a7790.dtsi | 5 | ||||
| -rw-r--r-- | arch/arm/boot/dts/r8a7793.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/r8a7794.dtsi | 2 |
5 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi index 99c10ebbaca2..fe787b4751d2 100644 --- a/arch/arm/boot/dts/r8a7778.dtsi +++ b/arch/arm/boot/dts/r8a7778.dtsi @@ -455,7 +455,6 @@ #clock-cells = <0>; /* This value must be overridden by the board. */ clock-frequency = <0>; - status = "disabled"; }; /* Special CPG clocks */ diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi index 5c1d48d712a1..0c82097daffc 100644 --- a/arch/arm/boot/dts/r8a7779.dtsi +++ b/arch/arm/boot/dts/r8a7779.dtsi @@ -458,7 +458,6 @@ #clock-cells = <0>; /* This value must be overridden by the board. */ clock-frequency = <0>; - status = "disabled"; }; /* Special CPG clocks */ diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi index 776a2aed81d2..935064fe7b13 100644 --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi @@ -1032,8 +1032,7 @@ pcie_bus_clk: pcie_bus { compatible = "fixed-clock"; #clock-cells = <0>; - clock-frequency = <100000000>; - status = "disabled"; + clock-frequency = <0>; }; /* @@ -1062,7 +1061,6 @@ #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 */ @@ -1078,7 +1076,6 @@ #clock-cells = <0>; /* This value must be overridden by the board. */ clock-frequency = <0>; - status = "disabled"; }; /* Special CPG clocks */ diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi index 6186179fd66d..cf6dc2aeef20 100644 --- a/arch/arm/boot/dts/r8a7793.dtsi +++ b/arch/arm/boot/dts/r8a7793.dtsi @@ -907,7 +907,6 @@ #clock-cells = <0>; /* This value must be overridden by the board. */ clock-frequency = <0>; - status = "disabled"; }; /* External SCIF clock */ @@ -916,7 +915,6 @@ #clock-cells = <0>; /* This value must be overridden by the board. */ clock-frequency = <0>; - status = "disabled"; }; /* Special CPG clocks */ diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi index b0bce43779f1..e45b23f31149 100644 --- a/arch/arm/boot/dts/r8a7794.dtsi +++ b/arch/arm/boot/dts/r8a7794.dtsi @@ -906,7 +906,6 @@ #clock-cells = <0>; /* This value must be overridden by the board. */ clock-frequency = <0>; - status = "disabled"; }; /* External SCIF clock */ @@ -915,7 +914,6 @@ #clock-cells = <0>; /* This value must be overridden by the board. */ clock-frequency = <0>; - status = "disabled"; }; /* Special CPG clocks */ |