Merge tag 'renesas-fixes2-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into fixes

Merge "Second Round of Renesas ARM Based SoC Fixes for v4.6" from Simon Horman:

* Don't disable referenced optional scif clock

* tag 'renesas-fixes2-for-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  arm64: dts: r8a7795: Don't disable referenced optional scif clock
  ARM: shmobile: timer: Fix preset_lpj leading to too short delays
  Revert "ARM: dts: porter: Enable SCIF_CLK frequency and pins"
  ARM: dts: r8a7791: Don't disable referenced optional clocks

5 files changed, 14 insertions, 35 deletions

diff --git a/arch/arm/boot/dts/r8a7791-koelsch.dts b/arch/arm/boot/dts/r8a7791-koelsch.dts
index 0ad71b81d3a2..cc6e28f81fe4 100644
--- a/arch/arm/boot/dts/r8a7791-koelsch.dts
+++ b/arch/arm/boot/dts/r8a7791-koelsch.dts
@@ -661,6 +661,7 @@
 };
 
 &pcie_bus_clk {
+        clock-frequency = <100000000>;
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/r8a7791-porter.dts b/arch/arm/boot/dts/r8a7791-porter.dts
index 6c08314427d6..a9285d9a57cd 100644
--- a/arch/arm/boot/dts/r8a7791-porter.dts
+++ b/arch/arm/boot/dts/r8a7791-porter.dts
@@ -143,19 +143,11 @@
 };
 
 &pfc {
-        pinctrl-0 = <&scif_clk_pins>;
-        pinctrl-names = "default";
-
         scif0_pins: serial0 {
                 renesas,groups = "scif0_data_d";
                 renesas,function = "scif0";
         };
 
-        scif_clk_pins: scif_clk {
-                renesas,groups = "scif_clk";
-                renesas,function = "scif_clk";
-        };
-
         ether_pins: ether {
                 renesas,groups = "eth_link", "eth_mdio", "eth_rmii";
                 renesas,function = "eth";
@@ -229,11 +221,6 @@
         status = "okay";
 };
 
-&scif_clk {
-        clock-frequency = <14745600>;
-        status = "okay";
-};
-
 &ether {
         pinctrl-0 = <&ether_pins &phy1_pins>;
         pinctrl-names = "default";
@@ -414,6 +401,7 @@
 };
 
 &pcie_bus_clk {
+        clock-frequency = <100000000>;
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index 6439f0569fe2..1cd1b6a3a72a 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1083,9 +1083,8 @@
                 pcie_bus_clk: pcie_bus_clk {
                         compatible = "fixed-clock";
                         #clock-cells = <0>;
-                        clock-frequency = <100000000>;
+                        clock-frequency = <0>;
                         clock-output-names = "pcie_bus";
-                        status = "disabled";
                 };
 
                 /* External SCIF clock */
@@ -1094,7 +1093,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 */
@@ -1112,7 +1110,6 @@
                         /* This value must be overridden by the board. */
                         clock-frequency = <0>;
                         clock-output-names = "can_clk";
-                        status = "disabled";
                 };
 
                 /* Special CPG clocks */
diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c
index ad008e4b0c49..67d79f9c6bad 100644
--- a/arch/arm/mach-shmobile/timer.c
+++ b/arch/arm/mach-shmobile/timer.c
@@ -40,8 +40,7 @@ static void __init shmobile_setup_delay_hz(unsigned int max_cpu_core_hz,
 void __init shmobile_init_delay(void)
 {
         struct device_node *np, *cpus;
-        bool is_a7_a8_a9 = false;
-        bool is_a15 = false;
+        unsigned int div = 0;
         bool has_arch_timer = false;
         u32 max_freq = 0;
 
@@ -55,27 +54,22 @@ void __init shmobile_init_delay(void)
                 if (!of_property_read_u32(np, "clock-frequency", &freq))
                         max_freq = max(max_freq, freq);
 
-                if (of_device_is_compatible(np, "arm,cortex-a8") ||
-                    of_device_is_compatible(np, "arm,cortex-a9")) {
-                        is_a7_a8_a9 = true;
-                } else if (of_device_is_compatible(np, "arm,cortex-a7")) {
-                        is_a7_a8_a9 = true;
-                        has_arch_timer = true;
-                } else if (of_device_is_compatible(np, "arm,cortex-a15")) {
-                        is_a15 = true;
+                if (of_device_is_compatible(np, "arm,cortex-a8")) {
+                        div = 2;
+                } else if (of_device_is_compatible(np, "arm,cortex-a9")) {
+                        div = 1;
+                } else if (of_device_is_compatible(np, "arm,cortex-a7") ||
+                         of_device_is_compatible(np, "arm,cortex-a15")) {
+                        div = 1;
                         has_arch_timer = true;
                 }
         }
 
         of_node_put(cpus);
 
-        if (!max_freq)
+        if (!max_freq || !div)
                 return;
 
-        if (!has_arch_timer || !IS_ENABLED(CONFIG_ARM_ARCH_TIMER)) {
-                if (is_a7_a8_a9)
-                        shmobile_setup_delay_hz(max_freq, 1, 3);
-                else if (is_a15)
-                        shmobile_setup_delay_hz(max_freq, 2, 4);
-        }
+        if (!has_arch_timer || !IS_ENABLED(CONFIG_ARM_ARCH_TIMER))
+                shmobile_setup_delay_hz(max_freq, 1, div);
 }
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
index a7315ebe3883..706d2426024f 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a7795.dtsi
@@ -120,7 +120,6 @@
                 compatible = "fixed-clock";
                 #clock-cells = <0>;
                 clock-frequency = <0>;
-                status = "disabled";
         };
 
         soc {