* [PATCH v6 15.2/17] ARM: shmobile: Remove Koelsch reference DTS
@ 2013-12-19 15:28 Laurent Pinchart
2013-12-23 0:42 ` Simon Horman
0 siblings, 1 reply; 2+ messages in thread
From: Laurent Pinchart @ 2013-12-19 15:28 UTC (permalink / raw)
To: linux-sh
Now that the DTS file r8a7790-koelsch.dts can be used with
board-koelsch.c and board-koelsch-reference.c, proceed with removing
r8a7790-koelsch-reference.dts.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
arch/arm/boot/dts/Makefile | 1 -
arch/arm/boot/dts/r8a7791-koelsch-reference.dts | 115 ------------------------
2 files changed, 116 deletions(-)
delete mode 100644 arch/arm/boot/dts/r8a7791-koelsch-reference.dts
Changes since v5:
- Moved the Makefile change from patch 11/17 here.
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 00aa144..ee0f2bd 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -226,7 +226,6 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \
r8a7779-marzen.dtb \
r8a7779-marzen-reference.dtb \
r8a7791-koelsch.dtb \
- r8a7791-koelsch-reference.dtb \
r8a7790-lager.dtb \
sh73a0-kzm9g.dtb \
sh73a0-kzm9g-reference.dtb \
diff --git a/arch/arm/boot/dts/r8a7791-koelsch-reference.dts b/arch/arm/boot/dts/r8a7791-koelsch-reference.dts
deleted file mode 100644
index 588ca17..0000000
--- a/arch/arm/boot/dts/r8a7791-koelsch-reference.dts
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Device Tree Source for the Koelsch board
- *
- * Copyright (C) 2013 Renesas Electronics Corporation
- * Copyright (C) 2013 Renesas Solutions Corp.
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- */
-
-/dts-v1/;
-#include "r8a7791.dtsi"
-#include <dt-bindings/gpio/gpio.h>
-
-/ {
- model = "Koelsch";
- compatible = "renesas,koelsch-reference", "renesas,r8a7791";
-
- chosen {
- bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
- };
-
- memory@40000000 {
- device_type = "memory";
- reg = <0 0x40000000 0 0x80000000>;
- };
-
- lbsc {
- #address-cells = <1>;
- #size-cells = <1>;
- };
-
- gpio-keys {
- compatible = "gpio-keys";
-
- key-a {
- gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
- linux,code = <30>;
- label = "SW30";
- gpio-key,wakeup;
- debounce-interval = <20>;
- };
- key-b {
- gpios = <&gpio7 1 GPIO_ACTIVE_LOW>;
- linux,code = <48>;
- label = "SW31";
- gpio-key,wakeup;
- debounce-interval = <20>;
- };
- key-c {
- gpios = <&gpio7 2 GPIO_ACTIVE_LOW>;
- linux,code = <46>;
- label = "SW32";
- gpio-key,wakeup;
- debounce-interval = <20>;
- };
- key-d {
- gpios = <&gpio7 3 GPIO_ACTIVE_LOW>;
- linux,code = <32>;
- label = "SW33";
- gpio-key,wakeup;
- debounce-interval = <20>;
- };
- key-e {
- gpios = <&gpio7 4 GPIO_ACTIVE_LOW>;
- linux,code = <18>;
- label = "SW34";
- gpio-key,wakeup;
- debounce-interval = <20>;
- };
- key-f {
- gpios = <&gpio7 5 GPIO_ACTIVE_LOW>;
- linux,code = <33>;
- label = "SW35";
- gpio-key,wakeup;
- debounce-interval = <20>;
- };
- key-g {
- gpios = <&gpio7 6 GPIO_ACTIVE_LOW>;
- linux,code = <34>;
- label = "SW36";
- gpio-key,wakeup;
- debounce-interval = <20>;
- };
- };
-
- leds {
- compatible = "gpio-leds";
- led6 {
- gpios = <&gpio2 19 GPIO_ACTIVE_HIGH>;
- };
- led7 {
- gpios = <&gpio2 20 GPIO_ACTIVE_HIGH>;
- };
- led8 {
- gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>;
- };
- };
-};
-
-&pfc {
- pinctrl-0 = <&scif0_pins &scif1_pins>;
- pinctrl-names = "default";
-
- scif0_pins: serial0 {
- renesas,groups = "scif0_data_d";
- renesas,function = "scif0";
- };
-
- scif1_pins: serial1 {
- renesas,groups = "scif1_data_d";
- renesas,function = "scif1";
- };
-};
--
1.8.3.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v6 15.2/17] ARM: shmobile: Remove Koelsch reference DTS
2013-12-19 15:28 [PATCH v6 15.2/17] ARM: shmobile: Remove Koelsch reference DTS Laurent Pinchart
@ 2013-12-23 0:42 ` Simon Horman
0 siblings, 0 replies; 2+ messages in thread
From: Simon Horman @ 2013-12-23 0:42 UTC (permalink / raw)
To: linux-sh
On Thu, Dec 19, 2013 at 04:28:43PM +0100, Laurent Pinchart wrote:
> Now that the DTS file r8a7790-koelsch.dts can be used with
> board-koelsch.c and board-koelsch-reference.c, proceed with removing
> r8a7790-koelsch-reference.dts.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Thanks, I have queued this up.
> ---
> arch/arm/boot/dts/Makefile | 1 -
> arch/arm/boot/dts/r8a7791-koelsch-reference.dts | 115 ------------------------
> 2 files changed, 116 deletions(-)
> delete mode 100644 arch/arm/boot/dts/r8a7791-koelsch-reference.dts
>
> Changes since v5:
>
> - Moved the Makefile change from patch 11/17 here.
>
> diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
> index 00aa144..ee0f2bd 100644
> --- a/arch/arm/boot/dts/Makefile
> +++ b/arch/arm/boot/dts/Makefile
> @@ -226,7 +226,6 @@ dtb-$(CONFIG_ARCH_SHMOBILE_LEGACY) += emev2-kzm9d.dtb \
> r8a7779-marzen.dtb \
> r8a7779-marzen-reference.dtb \
> r8a7791-koelsch.dtb \
> - r8a7791-koelsch-reference.dtb \
> r8a7790-lager.dtb \
> sh73a0-kzm9g.dtb \
> sh73a0-kzm9g-reference.dtb \
> diff --git a/arch/arm/boot/dts/r8a7791-koelsch-reference.dts b/arch/arm/boot/dts/r8a7791-koelsch-reference.dts
> deleted file mode 100644
> index 588ca17..0000000
> --- a/arch/arm/boot/dts/r8a7791-koelsch-reference.dts
> +++ /dev/null
> @@ -1,115 +0,0 @@
> -/*
> - * Device Tree Source for the Koelsch board
> - *
> - * Copyright (C) 2013 Renesas Electronics Corporation
> - * Copyright (C) 2013 Renesas Solutions Corp.
> - *
> - * This file is licensed under the terms of the GNU General Public License
> - * version 2. This program is licensed "as is" without any warranty of any
> - * kind, whether express or implied.
> - */
> -
> -/dts-v1/;
> -#include "r8a7791.dtsi"
> -#include <dt-bindings/gpio/gpio.h>
> -
> -/ {
> - model = "Koelsch";
> - compatible = "renesas,koelsch-reference", "renesas,r8a7791";
> -
> - chosen {
> - bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
> - };
> -
> - memory@40000000 {
> - device_type = "memory";
> - reg = <0 0x40000000 0 0x80000000>;
> - };
> -
> - lbsc {
> - #address-cells = <1>;
> - #size-cells = <1>;
> - };
> -
> - gpio-keys {
> - compatible = "gpio-keys";
> -
> - key-a {
> - gpios = <&gpio7 0 GPIO_ACTIVE_LOW>;
> - linux,code = <30>;
> - label = "SW30";
> - gpio-key,wakeup;
> - debounce-interval = <20>;
> - };
> - key-b {
> - gpios = <&gpio7 1 GPIO_ACTIVE_LOW>;
> - linux,code = <48>;
> - label = "SW31";
> - gpio-key,wakeup;
> - debounce-interval = <20>;
> - };
> - key-c {
> - gpios = <&gpio7 2 GPIO_ACTIVE_LOW>;
> - linux,code = <46>;
> - label = "SW32";
> - gpio-key,wakeup;
> - debounce-interval = <20>;
> - };
> - key-d {
> - gpios = <&gpio7 3 GPIO_ACTIVE_LOW>;
> - linux,code = <32>;
> - label = "SW33";
> - gpio-key,wakeup;
> - debounce-interval = <20>;
> - };
> - key-e {
> - gpios = <&gpio7 4 GPIO_ACTIVE_LOW>;
> - linux,code = <18>;
> - label = "SW34";
> - gpio-key,wakeup;
> - debounce-interval = <20>;
> - };
> - key-f {
> - gpios = <&gpio7 5 GPIO_ACTIVE_LOW>;
> - linux,code = <33>;
> - label = "SW35";
> - gpio-key,wakeup;
> - debounce-interval = <20>;
> - };
> - key-g {
> - gpios = <&gpio7 6 GPIO_ACTIVE_LOW>;
> - linux,code = <34>;
> - label = "SW36";
> - gpio-key,wakeup;
> - debounce-interval = <20>;
> - };
> - };
> -
> - leds {
> - compatible = "gpio-leds";
> - led6 {
> - gpios = <&gpio2 19 GPIO_ACTIVE_HIGH>;
> - };
> - led7 {
> - gpios = <&gpio2 20 GPIO_ACTIVE_HIGH>;
> - };
> - led8 {
> - gpios = <&gpio2 21 GPIO_ACTIVE_HIGH>;
> - };
> - };
> -};
> -
> -&pfc {
> - pinctrl-0 = <&scif0_pins &scif1_pins>;
> - pinctrl-names = "default";
> -
> - scif0_pins: serial0 {
> - renesas,groups = "scif0_data_d";
> - renesas,function = "scif0";
> - };
> -
> - scif1_pins: serial1 {
> - renesas,groups = "scif1_data_d";
> - renesas,function = "scif1";
> - };
> -};
> --
> 1.8.3.2
>
> --
> 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
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-12-23 0:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-19 15:28 [PATCH v6 15.2/17] ARM: shmobile: Remove Koelsch reference DTS Laurent Pinchart
2013-12-23 0:42 ` Simon Horman
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).