Return-Path: Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3wZB1N5qn3zDqVD for ; Sat, 27 May 2017 02:10:16 +1000 (AEST) Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v4QG8rNt034683 for ; Fri, 26 May 2017 12:10:09 -0400 Received: from e12.ny.us.ibm.com (e12.ny.us.ibm.com [129.33.205.202]) by mx0a-001b2d01.pphosted.com with ESMTP id 2apknxb3m5-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Fri, 26 May 2017 12:10:09 -0400 Received: from localhost by e12.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 26 May 2017 12:10:08 -0400 Received: from b01cxnp22033.gho.pok.ibm.com (9.57.198.23) by e12.ny.us.ibm.com (146.89.104.199) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 26 May 2017 12:10:05 -0400 Received: from b01ledav002.gho.pok.ibm.com (b01ledav002.gho.pok.ibm.com [9.57.199.107]) by b01cxnp22033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v4QGA0FM20578320; Fri, 26 May 2017 16:10:04 GMT Received: from b01ledav002.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 3E23E124055; Fri, 26 May 2017 12:07:40 -0400 (EDT) Received: from oc3016140333.ibm.com (unknown [9.41.179.225]) by b01ledav002.gho.pok.ibm.com (Postfix) with ESMTP id C5414124035; Fri, 26 May 2017 12:07:39 -0400 (EDT) From: Eddie James To: openbmc@lists.ozlabs.org Cc: joel@jms.id.au, clg@kaod.org, "Edward A. James" Subject: [PATCH linux dev-4.10 v4] arm: dts: aspeed: Add missing clock sources for barreleye Date: Fri, 26 May 2017 11:10:02 -0500 X-Mailer: git-send-email 1.8.3.1 X-TM-AS-GCONF: 00 x-cbid: 17052616-0048-0000-0000-0000019064FF X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007121; HX=3.00000241; KW=3.00000007; PH=3.00000004; SC=3.00000212; SDB=6.00865899; UDB=6.00430052; IPR=6.00645760; BA=6.00005375; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00015597; XFM=3.00000015; UTC=2017-05-26 16:10:06 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17052616-0049-0000-0000-0000414727F0 Message-Id: <1495815002-1808-1-git-send-email-eajames@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2017-05-26_11:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=1 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1705260290 X-BeenThere: openbmc@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Development list for OpenBMC List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 May 2017 16:10:17 -0000 From: "Edward A. James" Reorganize flash controllers into the ast2400 config and edit all the ast2400 machine configs. Barreleye wasn't booting with the new aspeed-smc driver. Signed-off-by: Edward A. James --- arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts | 44 ++++++++------------- arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts | 37 ++++++------------ arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts | 47 +++++++--------------- arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 54 +++++++++----------------- arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts | 38 ++++++------------ arch/arm/boot/dts/aspeed-g4.dtsi | 34 ++++++++++++++++ 6 files changed, 106 insertions(+), 148 deletions(-) diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts index be1f2d1..6c4221c 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-barreleye.dts @@ -31,34 +31,6 @@ }; }; - ahb { - bmc_pnor: fmc@1e620000 { - reg = < 0x1e620000 0x94 - 0x20000000 0x02000000 >; - #address-cells = <1>; - #size-cells = <0>; - compatible = "aspeed,ast2400-fmc"; - flash@0 { - reg = < 0 >; - compatible = "jedec,spi-nor" ; -#include "aspeed-bmc-opp-flash-layout.dtsi" - }; - }; - - host_pnor: spi@1e630000 { - reg = < 0x1e630000 0x18 - 0x30000000 0x02000000 >; - #address-cells = <1>; - #size-cells = <0>; - compatible = "aspeed,ast2400-spi"; - flash@0 { - reg = < 0 >; - compatible = "jedec,spi-nor" ; - label = "pnor"; - }; - }; - }; - leds { compatible = "gpio-leds"; @@ -76,6 +48,22 @@ }; }; +&bmc_pnor { + status = "okay"; + flash@0 { + status = "okay"; +#include "aspeed-bmc-opp-flash-layout.dtsi" + }; +}; + +&host_pnor { + status = "okay"; + flash@0 { + status = "okay"; + label = "pnor"; + }; +}; + &pinctrl { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_flbusy_default &pinctrl_flwp_default diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts index fe63621..dffe1cd 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-firestone.dts @@ -50,34 +50,21 @@ gpios = <&gpio ASPEED_GPIO(A, 2) GPIO_ACTIVE_LOW>; }; }; +}; - ahb { - fmc@1e620000 { - reg = < 0x1e620000 0x94 - 0x20000000 0x02000000 >; - #address-cells = <1>; - #size-cells = <0>; - compatible = "aspeed,ast2400-fmc"; - - flash@0 { - reg = < 0 >; - compatible = "jedec,spi-nor" ; +&bmc_pnor { + status = "okay"; + flash@0 { + status = "okay"; #include "aspeed-bmc-opp-flash-layout.dtsi" - }; - }; + }; +}; - spi@1e630000 { - reg = < 0x1e630000 0x18 - 0x30000000 0x02000000 >; - #address-cells = <1>; - #size-cells = <0>; - compatible = "aspeed,ast2400-spi"; - flash@0 { - reg = < 0 >; - compatible = "jedec,spi-nor" ; - label = "pnor"; - }; - }; +&host_pnor { + status = "okay"; + flash@0 { + status = "okay"; + label = "pnor"; }; }; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts index 121612a..c6c5e14 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-garrison.dts @@ -30,42 +30,23 @@ reg = <0x5f000000 0x01000000>; /* 16MB */ }; }; +}; - ahb { - - bmc_pnor: fmc@1e620000 { - reg = < 0x1e620000 0x94 - 0x20000000 0x02000000 >; - #address-cells = <1>; - #size-cells = <0>; - compatible = "aspeed,ast2400-fmc"; - aspeed,fmc-has-dma; - interrupts = <19>; - clocks = <&clk_ahb>; - clock-names = "ahb"; - flash@0 { - reg = < 0 >; - compatible = "jedec,spi-nor" ; - m25p,fast-read; +&bmc_pnor { + status = "okay"; + flash@0 { + status = "okay"; + m25p,fast-read; #include "aspeed-bmc-opp-flash-layout.dtsi" - }; - }; + }; +}; - host_pnor: spi@1e630000 { - reg = < 0x1e630000 0x18 - 0x30000000 0x02000000 >; - #address-cells = <1>; - #size-cells = <0>; - compatible = "aspeed,ast2400-spi"; - clocks = <&clk_ahb>; - clock-names = "ahb"; - flash { - reg = < 0 >; - compatible = "jedec,spi-nor" ; - label = "pnor"; - m25p,fast-read; - }; - }; +&host_pnor { + status = "okay"; + flash@0 { + status = "okay"; + label = "pnor"; + m25p,fast-read; }; }; diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts index b4faa1d..f343aa4 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts @@ -47,42 +47,6 @@ }; }; - ahb { - bmc_pnor: fmc@1e620000 { - reg = < 0x1e620000 0x94 - 0x20000000 0x02000000 >; - #address-cells = <1>; - #size-cells = <0>; - compatible = "aspeed,ast2400-fmc"; - aspeed,fmc-has-dma; - interrupts = <19>; - clocks = <&clk_ahb>; - clock-names = "ahb"; - flash@0 { - reg = < 0 >; - compatible = "jedec,spi-nor" ; - m25p,fast-read; -#include "aspeed-bmc-opp-flash-layout.dtsi" - }; - }; - - host_pnor: spi@1e630000 { - reg = < 0x1e630000 0x18 - 0x30000000 0x02000000 >; - #address-cells = <1>; - #size-cells = <0>; - compatible = "aspeed,ast2400-spi"; - clocks = <&clk_ahb>; - clock-names = "ahb"; - flash { - reg = < 0 >; - compatible = "jedec,spi-nor" ; - label = "pnor"; - m25p,fast-read; - }; - }; - }; - gpio-fsi { compatible = "fsi-master-gpio", "fsi-master"; @@ -94,6 +58,24 @@ }; }; +&bmc_pnor { + status = "okay"; + flash@0 { + status = "okay"; + m25p,fast-read; +#include "aspeed-bmc-opp-flash-layout.dtsi" + }; +}; + +&host_pnor { + status = "okay"; + flash@0 { + status = "okay"; + label = "pnor"; + m25p,fast-read; + }; +}; + &pinctrl { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_flbusy_default &pinctrl_flwp_default diff --git a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts index 7132460..e55685d 100644 --- a/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts +++ b/arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts @@ -30,35 +30,21 @@ reg = <0x47800000 0x00800000>; /* 8MB */ }; }; +}; - ahb { - bmc_pnor: fmc@1e620000 { - reg = < 0x1e620000 0x94 - 0x20000000 0x02000000 >; - #address-cells = <1>; - #size-cells = <0>; - compatible = "aspeed,ast2400-fmc"; - aspeed,fmc-has-dma; - interrupts = <19>; - flash@0 { - reg = < 0 >; - compatible = "jedec,spi-nor" ; +&bmc_pnor { + status = "okay"; + flash@0 { + status = "okay"; #include "aspeed-bmc-opp-flash-layout.dtsi" - }; - }; + }; +}; - host_pnor: spi@1e630000 { - reg = < 0x1e630000 0x18 - 0x30000000 0x01000000 >; - #address-cells = <1>; - #size-cells = <0>; - compatible = "aspeed,ast2400-smc"; - flash { - reg = < 0 >; - compatible = "jedec,spi-nor" ; - label = "pnor"; - }; - }; +&host_pnor { + status = "okay"; + flash@0 { + status = "okay"; + label = "pnor"; }; }; diff --git a/arch/arm/boot/dts/aspeed-g4.dtsi b/arch/arm/boot/dts/aspeed-g4.dtsi index d8827d5..9fb7889 100644 --- a/arch/arm/boot/dts/aspeed-g4.dtsi +++ b/arch/arm/boot/dts/aspeed-g4.dtsi @@ -44,6 +44,40 @@ #size-cells = <1>; ranges; + bmc_pnor: fmc@1e620000 { + reg = < 0x1e620000 0x94 + 0x20000000 0x02000000 >; + #address-cells = <1>; + #size-cells = <0>; + compatible = "aspeed,ast2400-fmc"; + status = "disabled"; + aspeed,fmc-has-dma; + interrupts = <19>; + clocks = <&clk_ahb>; + clock-names = "ahb"; + flash@0 { + reg = < 0 >; + compatible = "jedec,spi-nor" ; + status = "disabled"; + }; + }; + + host_pnor: spi@1e630000 { + reg = < 0x1e630000 0x18 + 0x30000000 0x02000000 >; + #address-cells = <1>; + #size-cells = <0>; + compatible = "aspeed,ast2400-spi"; + status = "disabled"; + clocks = <&clk_ahb>; + clock-names = "ahb"; + flash@0 { + reg = < 0 >; + compatible = "jedec,spi-nor" ; + status = "disabled"; + }; + }; + vic: interrupt-controller@1e6c0080 { compatible = "aspeed,ast2400-vic"; interrupt-controller; -- 1.8.3.1