linux-sh.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Simon Horman <horms@verge.net.au>
To: linux-sh@vger.kernel.org
Subject: Re: [PATCH 2/2] ARM: shmobile: marzen: enable INTC IRQ and fixup SMSC IRQ number
Date: Wed, 02 Oct 2013 08:06:06 +0000	[thread overview]
Message-ID: <20131002080604.GD28462@verge.net.au> (raw)
In-Reply-To: <201308090144.03912.sergei.shtylyov@cogentembedded.com>

On Tue, Oct 01, 2013 at 11:20:01PM -0700, Kuninori Morimoto wrote:
> This patch adds missing INTC IRQ settings,
> and fixup miss-setting of SMSC IRQ number.
> 
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Please split this into two patches.

1. A DT patch that modifies r8a7779-marzen-reference.dts
2. A board patch that modifies board-marzen-reference.c

> ---
>  arch/arm/boot/dts/r8a7779-marzen-reference.dts  |    8 ++++++--
>  arch/arm/mach-shmobile/board-marzen-reference.c |    1 +
>  2 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/r8a7779-marzen-reference.dts b/arch/arm/boot/dts/r8a7779-marzen-reference.dts
> index 6d55083..ab4110a 100644
> --- a/arch/arm/boot/dts/r8a7779-marzen-reference.dts
> +++ b/arch/arm/boot/dts/r8a7779-marzen-reference.dts
> @@ -42,8 +42,8 @@
>  		pinctrl-names = "default";
>  
>  		phy-mode = "mii";
> -		interrupt-parent = <&gic>;
> -		interrupts = <0 28 0x4>;
> +		interrupt-parent = <&irqpin0>;
> +		interrupts = <1 0>; /* IRQ1: hwirq 1 on irqpin0 */
>  		reg-io-width = <4>;
>  		vddvario-supply = <&fixedregulator3v3>;
>  		vdd33a-supply = <&fixedregulator3v3>;
> @@ -63,6 +63,10 @@
>  	};
>  };
>  
> +&irqpin0 {
> +	status = "okay";
> +};
> +
>  &pfc {
>  	pinctrl-0 = <&scif2_pins &scif4_pins &sdhi0_pins>;
>  	pinctrl-names = "default";
> diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c
> index 3f4250a..2773936 100644
> --- a/arch/arm/mach-shmobile/board-marzen-reference.c
> +++ b/arch/arm/mach-shmobile/board-marzen-reference.c
> @@ -28,6 +28,7 @@
>  static void __init marzen_init(void)
>  {
>  	r8a7779_add_standard_devices_dt();
> +	r8a7779_init_irq_extpin_dt(1); /* IRQ1 as individual interrupt */
>  }
>  
>  static const char *marzen_boards_compat_dt[] __initdata = {
> -- 
> 1.7.9.5
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

      parent reply	other threads:[~2013-10-02  8:06 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-08 21:40 [PATCH 0/2] R8A7779/Marzen: HPB-DMAC support for SDHI0 Sergei Shtylyov
2013-08-08 21:42 ` [PATCH 1/2] ARM: shmobile: r8a7779: add HPB-DMAC support Sergei Shtylyov
2013-08-09  1:33   ` Kuninori Morimoto
2013-08-08 21:44 ` [PATCH 2/2] ARM: shmobile: Marzen: enable DMA for SDHI0 Sergei Shtylyov
2013-09-28 20:12   ` [PATCH 2/2] ARM: shmobile: marzen: enable HPB-DMAC in defconfig Sergei Shtylyov
2013-09-30  0:49     ` Simon Horman
2013-10-02  6:20   ` [PATCH 2/2] ARM: shmobile: marzen: enable INTC IRQ and fixup SMSC IRQ number Kuninori Morimoto
2013-10-02  8:06   ` Simon Horman [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20131002080604.GD28462@verge.net.au \
    --to=horms@verge.net.au \
    --cc=linux-sh@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).