From patchwork Fri Feb 4 23:25:41 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Meador Inge X-Patchwork-Id: 81965 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id 21548B83A6 for ; Sat, 5 Feb 2011 10:26:54 +1100 (EST) Received: from relay1.mentorg.com (relay1.mentorg.com [192.94.38.131]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "relay1.mentorg.com", Issuer "Entrust Certification Authority - L1B" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 8966BB75DF; Sat, 5 Feb 2011 10:26:13 +1100 (EST) Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1PlV2Z-0003bU-7v from meador_inge@mentor.com ; Fri, 04 Feb 2011 15:26:11 -0800 Received: from na2-mail.mgc.mentorg.com ([134.86.114.213]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Fri, 4 Feb 2011 15:26:10 -0800 Received: from localhost.localdomain ([134.86.101.95]) by na2-mail.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.3959); Fri, 4 Feb 2011 16:26:09 -0700 From: Meador Inge To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v3 4/4] powerpc: Replacing "protected-sources" with "pic-no-reset" in DTS files Date: Fri, 4 Feb 2011 17:25:41 -0600 Message-Id: <1296861941-3370-5-git-send-email-meador_inge@mentor.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1296861941-3370-1-git-send-email-meador_inge@mentor.com> References: <1296861941-3370-1-git-send-email-meador_inge@mentor.com> X-OriginalArrivalTime: 04 Feb 2011 23:26:09.0930 (UTC) FILETIME=[E7A5E6A0:01CBC4C2] Cc: devicetree-discuss@lists.ozlabs.org, Hollis Blanchard X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org The "protected-sources" property was being used in the AMP configured MPC8572DS and P2020RDB DTS files. This changeset modifies those files to use "pic-no-reset" instead. Signed-off-by: Meador Inge Cc: Hollis Blanchard Cc: Kumar Gala --- arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts | 6 +----- arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts | 11 +---------- arch/powerpc/boot/dts/p2020rdb_camp_core0.dts | 7 +------ arch/powerpc/boot/dts/p2020rdb_camp_core1.dts | 7 +------ 4 files changed, 4 insertions(+), 27 deletions(-) diff --git a/arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts b/arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts index 3375c2a..4f7ee6d 100644 --- a/arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts +++ b/arch/powerpc/boot/dts/mpc8572ds_camp_core0.dts @@ -252,11 +252,7 @@ reg = <0x40000 0x40000>; compatible = "chrp,open-pic"; device_type = "open-pic"; - protected-sources = < - 31 32 33 37 38 39 /* enet2 enet3 */ - 76 77 78 79 26 42 /* dma2 pci2 serial*/ - 0xe4 0xe5 0xe6 0xe7 /* msi */ - >; + pic-no-reset; }; }; diff --git a/arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts b/arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts index e7b477f..62fd64f 100644 --- a/arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts +++ b/arch/powerpc/boot/dts/mpc8572ds_camp_core1.dts @@ -178,16 +178,7 @@ reg = <0x40000 0x40000>; compatible = "chrp,open-pic"; device_type = "open-pic"; - protected-sources = < - 18 16 10 42 45 58 /* MEM L2 mdio serial crypto */ - 29 30 34 35 36 40 /* enet0 enet1 */ - 24 25 20 21 22 23 /* pci0 pci1 dma1 */ - 43 /* i2c */ - 0x1 0x2 0x3 0x4 /* pci slot */ - 0x9 0xa 0xb 0xc /* usb */ - 0x6 0x7 0xe 0x5 /* Audio elgacy SATA */ - 0xe0 0xe1 0xe2 0xe3 /* msi */ - >; + pic-no-reset; }; }; diff --git a/arch/powerpc/boot/dts/p2020rdb_camp_core0.dts b/arch/powerpc/boot/dts/p2020rdb_camp_core0.dts index 0fe93d0..f749cbb 100644 --- a/arch/powerpc/boot/dts/p2020rdb_camp_core0.dts +++ b/arch/powerpc/boot/dts/p2020rdb_camp_core0.dts @@ -318,12 +318,7 @@ reg = <0x40000 0x40000>; compatible = "chrp,open-pic"; device_type = "open-pic"; - protected-sources = < - 42 76 77 78 79 /* serial1 , dma2 */ - 29 30 34 26 /* enet0, pci1 */ - 0xe0 0xe1 0xe2 0xe3 /* msi */ - 0xe4 0xe5 0xe6 0xe7 - >; + pic-no-reset; }; global-utilities@e0000 { diff --git a/arch/powerpc/boot/dts/p2020rdb_camp_core1.dts b/arch/powerpc/boot/dts/p2020rdb_camp_core1.dts index e95a512..6ef2e64 100644 --- a/arch/powerpc/boot/dts/p2020rdb_camp_core1.dts +++ b/arch/powerpc/boot/dts/p2020rdb_camp_core1.dts @@ -129,12 +129,7 @@ reg = <0x40000 0x40000>; compatible = "chrp,open-pic"; device_type = "open-pic"; - protected-sources = < - 17 18 43 42 59 47 /*ecm, mem, i2c, serial0, spi,gpio */ - 16 20 21 22 23 28 /* L2, dma1, USB */ - 03 35 36 40 31 32 33 /* mdio, enet1, enet2 */ - 72 45 58 25 /* sdhci, crypto , pci */ - >; + pic-no-reset; }; msi@41600 {