2016-04-06 19:32:13

by Sjoerd Simons

Subject: [PATCH] Revert "ARM: dts: porter: Enable SCIF_CLK frequency and pins"

This reverts commit 19417bd9c5112f58ea63e97ba72edabd5e1cc0fe as
according to
http://elinux.org/File:R-CarM2-KOELSCH_PORTER-B_PORTER_C_Comparison.pdf
the external oscilator for SCIF_CLK is not mounted on the porter boards.

Signed-off-by: Sjoerd Simons <[email protected]>

---

arch/arm/boot/dts/r8a7791-porter.dts | 13 -------------
1 file changed, 13 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7791-porter.dts b/arch/arm/boot/dts/r8a7791-porter.dts
index 9554d13..dbcf3bb 100644
--- a/arch/arm/boot/dts/r8a7791-porter.dts
+++ b/arch/arm/boot/dts/r8a7791-porter.dts
@@ -142,19 +142,11 @@
};

&pfc {
- pinctrl-0 = <&scif_clk_pins>;
- pinctrl-names = "default";
-
scif0_pins: serial0 {
groups = "scif0_data_d";
function = "scif0";
};

- scif_clk_pins: scif_clk {
- groups = "scif_clk";
- function = "scif_clk";
- };
-
ether_pins: ether {
groups = "eth_link", "eth_mdio", "eth_rmii";
function = "eth";
@@ -228,11 +220,6 @@
status = "okay";
};

-&scif_clk {
- clock-frequency = <14745600>;
- status = "okay";
-};
-
&ether {
pinctrl-0 = <&ether_pins &phy1_pins>;
pinctrl-names = "default";
--
2.8.0.rc3

2016-04-07 07:00:05

by Geert Uytterhoeven

Subject: Re: [PATCH] Revert "ARM: dts: porter: Enable SCIF_CLK frequency and pins"

On Wed, Apr 6, 2016 at 9:32 PM, Sjoerd Simons
<[email protected]> wrote:
> This reverts commit 19417bd9c5112f58ea63e97ba72edabd5e1cc0fe as
> according to
> http://elinux.org/File:R-CarM2-KOELSCH_PORTER-B_PORTER_C_Comparison.pdf
> the external oscilator for SCIF_CLK is not mounted on the porter boards.
>
> Signed-off-by: Sjoerd Simons <[email protected]>

Acked-by: Geert Uytterhoeven <[email protected]>

Gr{oetje,eeting}s,

Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds

2016-04-08 06:58:51

by Simon Horman

Subject: Re: [PATCH] Revert "ARM: dts: porter: Enable SCIF_CLK frequency and pins"

On Wed, Apr 06, 2016 at 09:32:06PM +0200, Sjoerd Simons wrote:
> This reverts commit 19417bd9c5112f58ea63e97ba72edabd5e1cc0fe as
> according to
> http://elinux.org/File:R-CarM2-KOELSCH_PORTER-B_PORTER_C_Comparison.pdf
> the external oscilator for SCIF_CLK is not mounted on the porter boards.
>
> Signed-off-by: Sjoerd Simons <[email protected]>

Thanks, I will queue up the following as a fix for v4.6 based
on v4.6-rc1.

>From e885767418bff0c591cc1e45babdd25d91b4a795 Mon Sep 17 00:00:00 2001
From: Sjoerd Simons <[email protected]>
Date: Wed, 6 Apr 2016 21:32:06 +0200
Subject: [PATCH] Revert "ARM: dts: porter: Enable SCIF_CLK frequency and pins"

This reverts commit 19417bd9c511 ("ARM: dts: porter: Enable SCIF_CLK
frequency and pins") as according to
http://elinux.org/File:R-CarM2-KOELSCH_PORTER-B_PORTER_C_Comparison.pdf
the external oscillator for SCIF_CLK is not mounted on the porter boards.

Signed-off-by: Sjoerd Simons <[email protected]>
Acked-by: Geert Uytterhoeven <[email protected]>
Signed-off-by: Simon Horman <[email protected]>
---
arch/arm/boot/dts/r8a7791-porter.dts | 13 -------------
1 file changed, 13 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7791-porter.dts b/arch/arm/boot/dts/r8a7791-porter.dts
index 6c08314427d6..329a9dcc88e9 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";
--
2.1.4