All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 03/10] ARM: shmobile: r8a7790: Reference clocks
@ 2013-10-29 15:04 Laurent Pinchart
  2013-11-06  7:18 ` Simon Horman
  2013-11-06 12:12 ` Laurent Pinchart
  0 siblings, 2 replies; 3+ messages in thread
From: Laurent Pinchart @ 2013-10-29 15:04 UTC (permalink / raw)
  To: linux-sh

Reference clocks using a "clocks" property in all nodes corresponding to
devices that require a clock.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 arch/arm/boot/dts/r8a7790-lager-reference.dts |  2 +-
 arch/arm/boot/dts/r8a7790-lager.dts           |  2 +-
 arch/arm/boot/dts/r8a7790.dtsi                | 12 ++++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boot/dts/r8a7790-lager-reference.dts b/arch/arm/boot/dts/r8a7790-lager-reference.dts
index 75730f5..68711ce 100644
--- a/arch/arm/boot/dts/r8a7790-lager-reference.dts
+++ b/arch/arm/boot/dts/r8a7790-lager-reference.dts
@@ -9,7 +9,7 @@
  */
 
 /dts-v1/;
-/include/ "r8a7790.dtsi"
+#include "r8a7790.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 
 / {
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 65ffd87..310fa63 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -9,7 +9,7 @@
  */
 
 /dts-v1/;
-/include/ "r8a7790.dtsi"
+#include "r8a7790.dtsi"
 #include <dt-bindings/gpio/gpio.h>
 
 / {
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 423500d..94c8373 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -8,6 +8,8 @@
  * kind, whether express or implied.
  */
 
+#include <dt-bindings/clock/r8a7790-clock.h>
+
 / {
 	compatible = "renesas,r8a7790";
 	interrupt-parent = <&gic>;
@@ -183,6 +185,7 @@
 		reg = <0 0xe6508000 0 0x40>;
 		interrupt-parent = <&gic>;
 		interrupts = <0 287 0x4>;
+		clocks = <&mstp3_clks R8A7790_CLK_I2C0>;
 		status = "disabled";
 	};
 
@@ -193,6 +196,7 @@
 		reg = <0 0xe6518000 0 0x40>;
 		interrupt-parent = <&gic>;
 		interrupts = <0 288 0x4>;
+		clocks = <&mstp3_clks R8A7790_CLK_I2C1>;
 		status = "disabled";
 	};
 
@@ -203,6 +207,7 @@
 		reg = <0 0xe6530000 0 0x40>;
 		interrupt-parent = <&gic>;
 		interrupts = <0 286 0x4>;
+		clocks = <&mstp3_clks R8A7790_CLK_I2C2>;
 		status = "disabled";
 	};
 
@@ -213,6 +218,7 @@
 		reg = <0 0xe6540000 0 0x40>;
 		interrupt-parent = <&gic>;
 		interrupts = <0 290 0x4>;
+		clocks = <&mstp3_clks R8A7790_CLK_I2C3>;
 		status = "disabled";
 	};
 
@@ -221,6 +227,7 @@
 		reg = <0 0xee200000 0 0x80>;
 		interrupt-parent = <&gic>;
 		interrupts = <0 169 0x4>;
+		clocks = <&mstp3_clks R8A7790_CLK_MMCIF0>;
 		reg-io-width = <4>;
 		status = "disabled";
 	};
@@ -230,6 +237,7 @@
 		reg = <0 0xee220000 0 0x80>;
 		interrupt-parent = <&gic>;
 		interrupts = <0 170 0x4>;
+		clocks = <&mstp3_clks R8A7790_CLK_MMCIF1>;
 		reg-io-width = <4>;
 		status = "disabled";
 	};
@@ -244,6 +252,7 @@
 		reg = <0 0xee100000 0 0x100>;
 		interrupt-parent = <&gic>;
 		interrupts = <0 165 4>;
+		clocks = <&mstp3_clks R8A7790_CLK_SDHI0>;
 		cap-sd-highspeed;
 		status = "disabled";
 	};
@@ -253,6 +262,7 @@
 		reg = <0 0xee120000 0 0x100>;
 		interrupt-parent = <&gic>;
 		interrupts = <0 166 4>;
+		clocks = <&mstp3_clks R8A7790_CLK_SDHI1>;
 		cap-sd-highspeed;
 		status = "disabled";
 	};
@@ -262,6 +272,7 @@
 		reg = <0 0xee140000 0 0x100>;
 		interrupt-parent = <&gic>;
 		interrupts = <0 167 4>;
+		clocks = <&mstp3_clks R8A7790_CLK_SDHI2>;
 		cap-sd-highspeed;
 		status = "disabled";
 	};
@@ -271,6 +282,7 @@
 		reg = <0 0xee160000 0 0x100>;
 		interrupt-parent = <&gic>;
 		interrupts = <0 168 4>;
+		clocks = <&mstp3_clks R8A7790_CLK_SDHI3>;
 		cap-sd-highspeed;
 		status = "disabled";
 	};
-- 
1.8.1.5


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH 03/10] ARM: shmobile: r8a7790: Reference clocks
  2013-10-29 15:04 [PATCH 03/10] ARM: shmobile: r8a7790: Reference clocks Laurent Pinchart
@ 2013-11-06  7:18 ` Simon Horman
  2013-11-06 12:12 ` Laurent Pinchart
  1 sibling, 0 replies; 3+ messages in thread
From: Simon Horman @ 2013-11-06  7:18 UTC (permalink / raw)
  To: linux-sh

On Tue, Oct 29, 2013 at 04:04:35PM +0100, Laurent Pinchart wrote:
> Reference clocks using a "clocks" property in all nodes corresponding to
> devices that require a clock.
> 
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> ---
>  arch/arm/boot/dts/r8a7790-lager-reference.dts |  2 +-
>  arch/arm/boot/dts/r8a7790-lager.dts           |  2 +-
>  arch/arm/boot/dts/r8a7790.dtsi                | 12 ++++++++++++
>  3 files changed, 14 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/r8a7790-lager-reference.dts b/arch/arm/boot/dts/r8a7790-lager-reference.dts
> index 75730f5..68711ce 100644
> --- a/arch/arm/boot/dts/r8a7790-lager-reference.dts
> +++ b/arch/arm/boot/dts/r8a7790-lager-reference.dts
> @@ -9,7 +9,7 @@
>   */
>  
>  /dts-v1/;
> -/include/ "r8a7790.dtsi"
> +#include "r8a7790.dtsi"
>  #include <dt-bindings/gpio/gpio.h>
>  
>  / {
> diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
> index 65ffd87..310fa63 100644
> --- a/arch/arm/boot/dts/r8a7790-lager.dts
> +++ b/arch/arm/boot/dts/r8a7790-lager.dts
> @@ -9,7 +9,7 @@
>   */
>  
>  /dts-v1/;
> -/include/ "r8a7790.dtsi"
> +#include "r8a7790.dtsi"
>  #include <dt-bindings/gpio/gpio.h>
>  
>  / {
> diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
> index 423500d..94c8373 100644
> --- a/arch/arm/boot/dts/r8a7790.dtsi
> +++ b/arch/arm/boot/dts/r8a7790.dtsi
> @@ -8,6 +8,8 @@
>   * kind, whether express or implied.
>   */
>  
> +#include <dt-bindings/clock/r8a7790-clock.h>
> +
>  / {
>  	compatible = "renesas,r8a7790";
>  	interrupt-parent = <&gic>;

I believe that the hunks above need to be either present before or merged
into the previous patch to avoid the following build errors.

#make
...
  DTC     arch/arm/boot/dts/r8a7790-lager.dtb
  DTC     arch/arm/boot/dts/r8a7790-lager-reference.dtb
Error: arch/arm/boot/dts/r8a7790.dtsi:349.30-31 syntax error
Error: arch/arm/boot/dts/r8a7790.dtsi:349.30-31 syntax error
FATAL ERROR: Unable to parse input tree
FATAL ERROR: Unable to parse input tree

# dtc -v
Version: DTC 1.3.0





^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH 03/10] ARM: shmobile: r8a7790: Reference clocks
  2013-10-29 15:04 [PATCH 03/10] ARM: shmobile: r8a7790: Reference clocks Laurent Pinchart
  2013-11-06  7:18 ` Simon Horman
@ 2013-11-06 12:12 ` Laurent Pinchart
  1 sibling, 0 replies; 3+ messages in thread
From: Laurent Pinchart @ 2013-11-06 12:12 UTC (permalink / raw)
  To: linux-sh

Hi Simon,

On Wednesday 06 November 2013 16:18:06 Simon Horman wrote:
> On Tue, Oct 29, 2013 at 04:04:35PM +0100, Laurent Pinchart wrote:
> > Reference clocks using a "clocks" property in all nodes corresponding to
> > devices that require a clock.
> > 
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
> > ---
> > 
> >  arch/arm/boot/dts/r8a7790-lager-reference.dts |  2 +-
> >  arch/arm/boot/dts/r8a7790-lager.dts           |  2 +-
> >  arch/arm/boot/dts/r8a7790.dtsi                | 12 ++++++++++++
> >  3 files changed, 14 insertions(+), 2 deletions(-)
> > 
> > diff --git a/arch/arm/boot/dts/r8a7790-lager-reference.dts
> > b/arch/arm/boot/dts/r8a7790-lager-reference.dts index 75730f5..68711ce
> > 100644
> > --- a/arch/arm/boot/dts/r8a7790-lager-reference.dts
> > +++ b/arch/arm/boot/dts/r8a7790-lager-reference.dts
> > @@ -9,7 +9,7 @@
> >   */
> >  
> >  /dts-v1/;
> > 
> > -/include/ "r8a7790.dtsi"
> > +#include "r8a7790.dtsi"
> >  #include <dt-bindings/gpio/gpio.h>
> >  
> >  / {
> > diff --git a/arch/arm/boot/dts/r8a7790-lager.dts
> > b/arch/arm/boot/dts/r8a7790-lager.dts index 65ffd87..310fa63 100644
> > --- a/arch/arm/boot/dts/r8a7790-lager.dts
> > +++ b/arch/arm/boot/dts/r8a7790-lager.dts
> > @@ -9,7 +9,7 @@
> >   */
> >  
> >  /dts-v1/;
> > 
> > -/include/ "r8a7790.dtsi"
> > +#include "r8a7790.dtsi"
> >  #include <dt-bindings/gpio/gpio.h>
> >  
> >  / {
> > diff --git a/arch/arm/boot/dts/r8a7790.dtsi
> > b/arch/arm/boot/dts/r8a7790.dtsi index 423500d..94c8373 100644
> > --- a/arch/arm/boot/dts/r8a7790.dtsi
> > +++ b/arch/arm/boot/dts/r8a7790.dtsi
> > @@ -8,6 +8,8 @@
> >   * kind, whether express or implied.
> >   */
> > 
> > +#include <dt-bindings/clock/r8a7790-clock.h>
> > +
> >  / {
> >  	compatible = "renesas,r8a7790";
> >  	interrupt-parent = <&gic>;
> 
> I believe that the hunks above need to be either present before or merged
> into the previous patch to avoid the following build errors.

You're right, I'll fix that. The initial implementation didn't make use of the 
symbols defined in dt-bindings/clock/r8a7790-clock.h in the previous patch and 
I forgot to compile-test all individual steps after changing this. I'll fix 
this.

> #make
> ...
>   DTC     arch/arm/boot/dts/r8a7790-lager.dtb
>   DTC     arch/arm/boot/dts/r8a7790-lager-reference.dtb
> Error: arch/arm/boot/dts/r8a7790.dtsi:349.30-31 syntax error
> Error: arch/arm/boot/dts/r8a7790.dtsi:349.30-31 syntax error
> FATAL ERROR: Unable to parse input tree
> FATAL ERROR: Unable to parse input tree
> 
> # dtc -v
> Version: DTC 1.3.0
-- 
Regards,

Laurent Pinchart


^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-11-06 12:12 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-29 15:04 [PATCH 03/10] ARM: shmobile: r8a7790: Reference clocks Laurent Pinchart
2013-11-06  7:18 ` Simon Horman
2013-11-06 12:12 ` Laurent Pinchart

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.