From patchwork Mon Dec 23 13:47:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 1214958 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47hLML1VQxz9sPV for ; Tue, 24 Dec 2019 00:50:06 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NL+svlQu"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 47hLMK6Lh8zDqLl for ; Tue, 24 Dec 2019 00:50:05 +1100 (AEDT) X-Original-To: openbmc@lists.ozlabs.org Delivered-To: openbmc@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::542; helo=mail-pg1-x542.google.com; envelope-from=joel.stan@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NL+svlQu"; dkim-atps=neutral Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 47hLJl1Vk4zDqFB for ; Tue, 24 Dec 2019 00:47:50 +1100 (AEDT) Received: by mail-pg1-x542.google.com with SMTP id b9so8843581pgk.12 for ; Mon, 23 Dec 2019 05:47:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=eZBhlggSyQtmTSr8CqNKTo81IynygsKuIbsXqnXdEc8=; b=NL+svlQuAkwL3O8kOzsN/vH3XbCYrH0/ZbUiQB90F2IbWujZN4fU2HF+vDJa8P0XeH jCTfsM1O+WQR6qgrJI14WdDqk+ip+EFI0C86mqtVOOxvEwYFLC+kJ0Q1qUZmw1VOQwtw D9ry9fc4+h8xBNiAZTPXcQpanqUeD3qpic5NBYHLZf24ejBMlUu/0/Z5MbJgf6xGnLvj YqX/g7PTYiUHxrfuPXcmovHf0EFOok44xVGTd3MRmmtkOO6YP+RZegbdB44KNDfBy3wh SQGxdfx32A/BEDNYSZd3v02kf8Z9Co7dSQYghVkhOqAaV7tAMf1nb20lnkpHr+I6Ge+x Xfeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=eZBhlggSyQtmTSr8CqNKTo81IynygsKuIbsXqnXdEc8=; b=naJ+DctPeV6jz/sk2Gut1ckgkIJ8lcCBGfKsE8udegXoqChlBnSYqs/bH7JK7qAq89 4ZJpTIIWWo333VHz+RZj42P6eIbYJMbYlYvWK748a50hA7HrlPQezwaEFM6Dvpmi8N3x Wi3+fKJ397Kdo8AjXAVI07j/kqtYjreYrgNxJPQUHJONmw66CBq2RCvj3pJzCBSEpR85 NDsxMldQQbLYupNZgk3b62uZIHGdv7S5k95H1I4yCAKJGvGy/FKL2Z9l03KMF1cGqBVS d64ROyLS7hg1R0NNTptTU+6UM4H24jl4sYs8IWQt2Wn9e1cHcajYgQimsOdfmace6ADD CcvQ== X-Gm-Message-State: APjAAAUtTCUYycjWft6aTMAkKrWQyXWbYshBNOVXI+l5LGLzP0DKvHRd QkwS5Za5JRChBg6HUM4Ygv9uLCmY X-Google-Smtp-Source: APXvYqzoQ7qGOkEyEyDnCLwWAcXrw+OTX9sDsLupvo/2qJgjvTn2NDzKQocSwFBaxGhJbe+J6eQ3oQ== X-Received: by 2002:a63:d62:: with SMTP id 34mr32581681pgn.268.1577108868449; Mon, 23 Dec 2019 05:47:48 -0800 (PST) Received: from localhost.localdomain ([45.124.203.14]) by smtp.gmail.com with ESMTPSA id b65sm22988588pgc.18.2019.12.23.05.47.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Dec 2019 05:47:48 -0800 (PST) From: Joel Stanley To: openbmc@lists.ozlabs.org, Andrew Jeffery Subject: [PATCH linux dev-5.4 1/4] ARM: dts: aspeed: tacoma: Fix fsi master node Date: Tue, 24 Dec 2019 00:47:32 +1100 Message-Id: <20191223134735.559200-2-joel@jms.id.au> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191223134735.559200-1-joel@jms.id.au> References: <20191223134735.559200-1-joel@jms.id.au> MIME-Version: 1.0 X-BeenThere: openbmc@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development list for OpenBMC List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "openbmc" This was broken when applying "ARM: dts: aspeed: tacoma: Add host FSI description". Signed-off-by: Joel Stanley Acked-by: Andrew Jeffery --- arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts index f02de4ab058c..5dfd597110f9 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts @@ -165,6 +165,11 @@ &emmc { status = "okay"; +}; + +&fsim0 { + status = "okay"; + #address-cells = <2>; #size-cells = <0>; From patchwork Mon Dec 23 13:47:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 1214959 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47hLNq3KXTz9sPV for ; Tue, 24 Dec 2019 00:51:23 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RddtxdLj"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 47hLNq22ykzDqLf for ; Tue, 24 Dec 2019 00:51:23 +1100 (AEDT) X-Original-To: openbmc@lists.ozlabs.org Delivered-To: openbmc@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::1044; helo=mail-pj1-x1044.google.com; envelope-from=joel.stan@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RddtxdLj"; dkim-atps=neutral Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 47hLJn4gsQzDqFB for ; Tue, 24 Dec 2019 00:47:53 +1100 (AEDT) Received: by mail-pj1-x1044.google.com with SMTP id t101so7527522pjb.4 for ; Mon, 23 Dec 2019 05:47:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=/jqUrRk/TIaYg25joKvtwqYSUC5aEpgX77iIaHrSFg4=; b=RddtxdLjEs//4QuXKwCCQmpSs29AeX303VhjrjJ/LsnJsVUSFkCVXAlk2X+BNTZMCR S8eTWcxm0TBUzhkIRJj47o5mTbcxSAXwWpVvHBU7sCNKoUk4RwR65qPLjoJWwvVNhAHU wfYZvZCzbROIV89SXjTgX+z+pIYtInD/7tRlPG5Xu6RU+2atMjJjgAs7BvwCEhwm4l0L SUQQDaokLqztg1fWHj2u+MxSQCkZTZAIM5iKx9vHLSoliJZl35TJJfzrW7eZVG4iCCzX RHw1q7odPSrRRl06g7kIUAJFepMTnNG19xoU0BRgbP9gUfAo7QlDV1ouDOr5SEAJl8PO coNg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=/jqUrRk/TIaYg25joKvtwqYSUC5aEpgX77iIaHrSFg4=; b=MziBjyGYt77rRLJSBNKGdgf+XDvrmTkXs2cKmCp7CRjuPtybYmHLGD3ZcJ9H/RjX8B Whb06GfSxp+4syLY9N7atuGYQkAOpr73uC039hbQp6wwBYVanhNtZm5aY/Hk8xZhYasp 2om6HVfvd5EDt8KMz+7Iny/FSo8Dc4NIy2VtRjCFpuX9qcvpD6rkDGtbElhEO2VzD6he iUZ7YqoO7gPhpu+IyiW6pGefWgz5IC0qjD45LSKi3E4gK2e5GCQKArNYPW8OXS+C/1/n KSJTv+VjgPmARqWGr8oL656dy+aYAXJL4pMCcpTp/93wXzdngTO4ZCLgjgwogmcsbdkZ xiYw== X-Gm-Message-State: APjAAAWzAstIiJ/UlwlyhVERRxYnBMrdl38t7Nbdz2WzmwZnKtmUrXVk zlE14J6tLCkQPOSADP8VerNKyIJy X-Google-Smtp-Source: APXvYqxwmkSFbZVEiobYyCzfSWVmQOKWSRLGzV8vImQNXeKjmlKboBeRg2G6nEc+gF2TCRBdkILf4A== X-Received: by 2002:a17:90b:142:: with SMTP id em2mr25105591pjb.4.1577108870698; Mon, 23 Dec 2019 05:47:50 -0800 (PST) Received: from localhost.localdomain ([45.124.203.14]) by smtp.gmail.com with ESMTPSA id b65sm22988588pgc.18.2019.12.23.05.47.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Dec 2019 05:47:50 -0800 (PST) From: Joel Stanley To: openbmc@lists.ozlabs.org, Andrew Jeffery Subject: [PATCH linux dev-5.4 2/4] ARM: dts: aspeed: tacoma: Remove duplicate i2c busses Date: Tue, 24 Dec 2019 00:47:33 +1100 Message-Id: <20191223134735.559200-3-joel@jms.id.au> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191223134735.559200-1-joel@jms.id.au> References: <20191223134735.559200-1-joel@jms.id.au> MIME-Version: 1.0 X-BeenThere: openbmc@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development list for OpenBMC List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "openbmc" This is a revert of "ARM: dts: aspeed: tacoma: Enable I2C busses", which was already applied as part of "ARM: dts: aspeed: Add Tacoma machine". Signed-off-by: Joel Stanley Reviewed-by: Andrew Jeffery --- arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 367 -------------------- 1 file changed, 367 deletions(-) diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts index 5dfd597110f9..73aaf58d9f42 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts @@ -825,373 +825,6 @@ status = "okay"; }; -&i2c0 { - status = "okay"; -}; - -&i2c1 { - status = "okay"; -}; - -&i2c2 { - status = "okay"; -}; - -&i2c3 { - status = "okay"; - - bmp: bmp280@77 { - compatible = "bosch,bmp280"; - reg = <0x77>; - #io-channel-cells = <1>; - }; - - max31785@52 { - compatible = "maxim,max31785a"; - reg = <0x52>; - #address-cells = <1>; - #size-cells = <0>; - - fan@0 { - compatible = "pmbus-fan"; - reg = <0>; - tach-pulses = <2>; - maxim,fan-rotor-input = "tach"; - maxim,fan-pwm-freq = <25000>; - maxim,fan-dual-tach; - maxim,fan-no-watchdog; - maxim,fan-no-fault-ramp; - maxim,fan-ramp = <2>; - maxim,fan-fault-pin-mon; - }; - - fan@1 { - compatible = "pmbus-fan"; - reg = <1>; - tach-pulses = <2>; - maxim,fan-rotor-input = "tach"; - maxim,fan-pwm-freq = <25000>; - maxim,fan-dual-tach; - maxim,fan-no-watchdog; - maxim,fan-no-fault-ramp; - maxim,fan-ramp = <2>; - maxim,fan-fault-pin-mon; - }; - - fan@2 { - compatible = "pmbus-fan"; - reg = <2>; - tach-pulses = <2>; - maxim,fan-rotor-input = "tach"; - maxim,fan-pwm-freq = <25000>; - maxim,fan-dual-tach; - maxim,fan-no-watchdog; - maxim,fan-no-fault-ramp; - maxim,fan-ramp = <2>; - maxim,fan-fault-pin-mon; - }; - - fan@3 { - compatible = "pmbus-fan"; - reg = <3>; - tach-pulses = <2>; - maxim,fan-rotor-input = "tach"; - maxim,fan-pwm-freq = <25000>; - maxim,fan-dual-tach; - maxim,fan-no-watchdog; - maxim,fan-no-fault-ramp; - maxim,fan-ramp = <2>; - maxim,fan-fault-pin-mon; - }; - }; - - dps: dps310@76 { - compatible = "infineon,dps310"; - reg = <0x76>; - #io-channel-cells = <0>; - }; - - pca0: pca9552@60 { - compatible = "nxp,pca9552"; - reg = <0x60>; - #address-cells = <1>; - #size-cells = <0>; - - gpio-controller; - #gpio-cells = <2>; - - gpio@0 { - reg = <0>; - type = ; - }; - - gpio@1 { - reg = <1>; - type = ; - }; - - gpio@2 { - reg = <2>; - type = ; - }; - - gpio@3 { - reg = <3>; - type = ; - }; - - gpio@4 { - reg = <4>; - type = ; - }; - - gpio@5 { - reg = <5>; - type = ; - }; - - gpio@6 { - reg = <6>; - type = ; - }; - - gpio@7 { - reg = <7>; - type = ; - }; - - gpio@8 { - reg = <8>; - type = ; - }; - - gpio@9 { - reg = <9>; - type = ; - }; - - gpio@10 { - reg = <10>; - type = ; - }; - - gpio@11 { - reg = <11>; - type = ; - }; - - gpio@12 { - reg = <12>; - type = ; - }; - - gpio@13 { - reg = <13>; - type = ; - }; - - gpio@14 { - reg = <14>; - type = ; - }; - - gpio@15 { - reg = <15>; - type = ; - }; - }; - - power-supply@68 { - compatible = "ibm,cffps1"; - reg = <0x68>; - }; - - power-supply@69 { - compatible = "ibm,cffps1"; - reg = <0x69>; - }; -}; - -&i2c4 { - status = "okay"; - - tmp423a@4c { - compatible = "ti,tmp423"; - reg = <0x4c>; - }; - - ir35221@70 { - compatible = "infineon,ir35221"; - reg = <0x70>; - }; - - ir35221@71 { - compatible = "infineon,ir35221"; - reg = <0x71>; - }; -}; - -&i2c5 { - status = "okay"; - - tmp423a@4c { - compatible = "ti,tmp423"; - reg = <0x4c>; - }; - - ir35221@70 { - compatible = "infineon,ir35221"; - reg = <0x70>; - }; - - ir35221@71 { - compatible = "infineon,ir35221"; - reg = <0x71>; - }; -}; - -&i2c7 { - status = "okay"; -}; - -&i2c9 { - status = "okay"; - - tmp275@4a { - compatible = "ti,tmp275"; - reg = <0x4a>; - }; -}; - -&i2c10 { - status = "okay"; -}; - -&i2c11 { - status = "okay"; - - pca9552: pca9552@60 { - compatible = "nxp,pca9552"; - reg = <0x60>; - #address-cells = <1>; - #size-cells = <0>; - gpio-controller; - #gpio-cells = <2>; - - gpio-line-names = "PS_SMBUS_RESET_N", "APSS_RESET_N", - "GPU0_TH_OVERT_N_BUFF", "GPU1_TH_OVERT_N_BUFF", - "GPU2_TH_OVERT_N_BUFF", "GPU3_TH_OVERT_N_BUFF", - "GPU4_TH_OVERT_N_BUFF", "GPU5_TH_OVERT_N_BUFF", - "GPU0_PWR_GOOD_BUFF", "GPU1_PWR_GOOD_BUFF", - "GPU2_PWR_GOOD_BUFF", "GPU3_PWR_GOOD_BUFF", - "GPU4_PWR_GOOD_BUFF", "GPU5_PWR_GOOD_BUFF", - "12V_BREAKER_FLT_N", "THROTTLE_UNLATCHED_N"; - - gpio@0 { - reg = <0>; - type = ; - }; - - gpio@1 { - reg = <1>; - type = ; - }; - - gpio@2 { - reg = <2>; - type = ; - }; - - gpio@3 { - reg = <3>; - type = ; - }; - - gpio@4 { - reg = <4>; - type = ; - }; - - gpio@5 { - reg = <5>; - type = ; - }; - - gpio@6 { - reg = <6>; - type = ; - }; - - gpio@7 { - reg = <7>; - type = ; - }; - - gpio@8 { - reg = <8>; - type = ; - }; - - gpio@9 { - reg = <9>; - type = ; - }; - - gpio@10 { - reg = <10>; - type = ; - }; - - gpio@11 { - reg = <11>; - type = ; - }; - - gpio@12 { - reg = <12>; - type = ; - }; - - gpio@13 { - reg = <13>; - type = ; - }; - - gpio@14 { - reg = <14>; - type = ; - }; - - gpio@15 { - reg = <15>; - type = ; - }; - }; - - rtc@32 { - compatible = "epson,rx8900"; - reg = <0x32>; - }; - - eeprom@51 { - compatible = "atmel,24c64"; - reg = <0x51>; - }; - - ucd90160@64 { - compatible = "ti,ucd90160"; - reg = <0x64>; - }; -}; - -&i2c12 { - status = "okay"; -}; - -&i2c13 { - status = "okay"; -}; - &pinctrl { /* Hog these as no driver is probed for the entire LPC block */ pinctrl-names = "default"; From patchwork Mon Dec 23 13:47:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 1214960 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47hLQ21RGxz9sPV for ; Tue, 24 Dec 2019 00:52:26 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="iup+V6FL"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 47hLQ16BV2zDqN8 for ; Tue, 24 Dec 2019 00:52:25 +1100 (AEDT) X-Original-To: openbmc@lists.ozlabs.org Delivered-To: openbmc@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::644; helo=mail-pl1-x644.google.com; envelope-from=joel.stan@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="iup+V6FL"; dkim-atps=neutral Received: from mail-pl1-x644.google.com (mail-pl1-x644.google.com [IPv6:2607:f8b0:4864:20::644]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 47hLJq5LT1zDqFB for ; Tue, 24 Dec 2019 00:47:55 +1100 (AEDT) Received: by mail-pl1-x644.google.com with SMTP id bd4so7219010plb.8 for ; Mon, 23 Dec 2019 05:47:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=90zRCuX1ryzYV7huVA1zyw178BV7WqH1bYZxnk8wgUo=; b=iup+V6FL54TKnZUhWvyuxfsbB634pB5GNB+/eP+t9tua+eiLO5ZEK8UiGN0Vkj+WX1 DcEcCQOi5WonJ+/zoGZN3NPzNQ9Cl+82WDWfD8w0WRsAtHiC0VnUDJ3HP0i2GOT9pfBz Qdh64IoW+KIPq+klHKsOeiJRZxrsJN5x/Wvy/+dBeWwFDV0Rgr79yPs35GiBOfofi0OM veN2R2mDm1IgeTNCJImb6AUM9XMd2lJDi78W3FNzOWkeUzeN81OFmZxHZs+uCgFHAwxu 1lhCED+ZY0P3WKuPLuhYpU8C7t0TRk+ACxorW4F22Ot6pBtvKdbwT/H8JDSrucWYRAXG af5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=90zRCuX1ryzYV7huVA1zyw178BV7WqH1bYZxnk8wgUo=; b=i2+8ln/RLA8nhNPklTPKBQt6ULtamW4qI1WQXMQMbuebndVMB3HpmhrQpTUyWtCini E5R81WsmXzWmgpsWqBjCNALhJZK/qXIL3+NsTa6QczOS0OO0QRPgvtN5U8kYDrVo0DeD oR2yNx1N+jFMSpzutk22DNY0in8OJN3lZGK/mXsZWBz5934y6HLu7dMM+WryBtc62aBw 90HrNgmmWGGpRT1vyT1tMvwA5iCQbrojCwPagt2qv2OtLlDlGajPMsqDqtY7n/0diVuK YlY5o5g1QRdnxvqeRD5MX5e1k5Mlh5TWNnRbl3bG3cM0DDQsLLTyv/n1VmxHeVMoEUIP G67w== X-Gm-Message-State: APjAAAUNFYZs/GM5J9sWSoYle9Zjblygog7R/Ct0I0jbQubQ7iM6UWpF JnktaV8WoRDtMmtu9BLd9JUHkm5a X-Google-Smtp-Source: APXvYqyDl59Tk8g673adpomWkq+Ic0E5iz0tJ0FI7dCIbUHHunSKV/nE0QbP+s3kXKckNBtM0Y3KJQ== X-Received: by 2002:a17:902:82cc:: with SMTP id u12mr28616942plz.342.1577108872902; Mon, 23 Dec 2019 05:47:52 -0800 (PST) Received: from localhost.localdomain ([45.124.203.14]) by smtp.gmail.com with ESMTPSA id b65sm22988588pgc.18.2019.12.23.05.47.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Dec 2019 05:47:52 -0800 (PST) From: Joel Stanley To: openbmc@lists.ozlabs.org, Andrew Jeffery Subject: [PATCH linux dev-5.4 3/4] ARM: dts: aspeed: tacoma: Remove duplicate flash nodes Date: Tue, 24 Dec 2019 00:47:34 +1100 Message-Id: <20191223134735.559200-4-joel@jms.id.au> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191223134735.559200-1-joel@jms.id.au> References: <20191223134735.559200-1-joel@jms.id.au> MIME-Version: 1.0 X-BeenThere: openbmc@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development list for OpenBMC List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "openbmc" This is a revert of "ARM: dts: aspeed: tacoma: Enable FMC and SPI devices" which was already applied as part of "ARM: dts: aspeed: Add Tacoma machine". Signed-off-by: Joel Stanley Reviewed-by: Andrew Jeffery --- arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts | 31 --------------------- 1 file changed, 31 deletions(-) diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts index 73aaf58d9f42..ff49ec76fa7c 100644 --- a/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts +++ b/arch/arm/boot/dts/aspeed-bmc-opp-tacoma.dts @@ -122,37 +122,6 @@ }; }; -&fmc { - status = "okay"; - flash@0 { - status = "okay"; - m25p,fast-read; - label = "bmc"; - spi-max-frequency = <50000000>; -#include "openbmc-flash-layout-128.dtsi" - }; - - flash@1 { - status = "okay"; - m25p,fast-read; - label = "alt-bmc"; - spi-max-frequency = <50000000>; - }; -}; - -&spi1 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_spi1_default>; - - flash@0 { - status = "okay"; - m25p,fast-read; - label = "pnor"; - spi-max-frequency = <100000000>; - }; -}; - &mac2 { status = "okay"; pinctrl-names = "default"; From patchwork Mon Dec 23 13:47:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 1214961 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47hLRJ6Rshz9sPV for ; Tue, 24 Dec 2019 00:53:32 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="iKybZvSV"; dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 47hLRJ58GkzDqCK for ; Tue, 24 Dec 2019 00:53:32 +1100 (AEDT) X-Original-To: openbmc@lists.ozlabs.org Delivered-To: openbmc@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::1043; helo=mail-pj1-x1043.google.com; envelope-from=joel.stan@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=jms.id.au Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="iKybZvSV"; dkim-atps=neutral Received: from mail-pj1-x1043.google.com (mail-pj1-x1043.google.com [IPv6:2607:f8b0:4864:20::1043]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 47hLJs54VhzDqLY for ; Tue, 24 Dec 2019 00:47:57 +1100 (AEDT) Received: by mail-pj1-x1043.google.com with SMTP id m13so7532987pjb.2 for ; Mon, 23 Dec 2019 05:47:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=57Oijn45epfHx8UrEcC/E9dVif2WfR8DVnG0LDbrF+s=; b=iKybZvSVXB9CPCxFdTSdnOF/lSw5GP/DWZcUkoBtIt15EeYGBnrNwnbmuDyng1UxLQ VJE6wttOZRN7I4s15GswhXiUOLp/zt5vlxCIiRUF7oYOzjosgIdlfk5gvwvA6g12W2X8 NlDMKipdNVjKmKaWpqAm5QIi9jYs0wR+dfv5tSZ2+tD0VQ6cI5NwJmMmM1lK7GpXn4Xv 74/ZzoNOiBVfvBcw0KoVqa5lM8lePR8/5LRhvMWDVL5DQpC8SC6Ufpvp4LJK5rfT/HhF CWndAlhlxgM+2eHZp3CyriNMP3NCBS8sn9O2nfn/7nePDWakQ+ZZA/haoTKQZtwpCF8I XIWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=57Oijn45epfHx8UrEcC/E9dVif2WfR8DVnG0LDbrF+s=; b=bGa2Nf4xy51+xERQ0V09PapOhVbfvujilTqwG5x89rruCLvIvW0kWEKao7L3IPtDb2 dkJXH29wFBL6W7fHaoahvHsxCkcJbKFBliir8k8WbN/3zdnWDulYg8T2Hftb9oGuai1d YkcxuactjsX1BlL+G+QBAUM1UpKlOdiASZVZHtCncqGg9cLg8S9a2fhwEJyRfi0UoZ00 CA0fqthriNovU6YS0v6sZFO4s973MsLEGMSYDYsdgEV5OZ7TlBxwC4xb886mxhBXlybi Tq9RiEBShdm7sauH04GNfzPqEIdaQwvvHcchN9RcgarfgQekG5Rqk0w6bl4CQKH04KWZ xbng== X-Gm-Message-State: APjAAAUKIIayqnIKtHrUEcJslCnXd6w+e/sePqj4jKRIxF3mXy4JOUwi mS706x6hnpKpCbdsMDMumUi3pMjg X-Google-Smtp-Source: APXvYqzHaDVCi00OKYgVX3Rzmk7AmKK7T8LKS2l4uQSrRzeWVqpIa71+hY7+lENFAUqp5lTqBMq2uA== X-Received: by 2002:a17:90a:8912:: with SMTP id u18mr33696231pjn.21.1577108875120; Mon, 23 Dec 2019 05:47:55 -0800 (PST) Received: from localhost.localdomain ([45.124.203.14]) by smtp.gmail.com with ESMTPSA id b65sm22988588pgc.18.2019.12.23.05.47.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Dec 2019 05:47:54 -0800 (PST) From: Joel Stanley To: openbmc@lists.ozlabs.org, Andrew Jeffery Subject: [PATCH linux dev-5.4 4/4] ARM: dts: aspeed-g6: Fix FSI master location Date: Tue, 24 Dec 2019 00:47:35 +1100 Message-Id: <20191223134735.559200-5-joel@jms.id.au> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191223134735.559200-1-joel@jms.id.au> References: <20191223134735.559200-1-joel@jms.id.au> MIME-Version: 1.0 X-BeenThere: openbmc@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development list for OpenBMC List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "openbmc" They were placed incorrectly when rebasing the patches on top of 5.4. Signed-off-by: Joel Stanley Reviewed-by: Andrew Jeffery --- arch/arm/boot/dts/aspeed-g6.dtsi | 39 ++++++++++++++++---------------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi index 2af9efa1faa1..99cc7d7ced4d 100644 --- a/arch/arm/boot/dts/aspeed-g6.dtsi +++ b/arch/arm/boot/dts/aspeed-g6.dtsi @@ -163,26 +163,6 @@ spi-max-frequency = <50000000>; status = "disabled"; }; - - fsim0: fsi@1e79b000 { - compatible = "aspeed,ast2600-fsi-master", "fsi-master"; - reg = <0x1e79b000 0x94>; - interrupts = ; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_fsi1_default>; - clocks = <&syscon ASPEED_CLK_GATE_FSICLK>; - status = "disabled"; - }; - - fsim1: fsi@1e79b100 { - compatible = "aspeed,ast2600-fsi-master", "fsi-master"; - reg = <0x1e79b100 0x94>; - interrupts = ; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_fsi2_default>; - clocks = <&syscon ASPEED_CLK_GATE_FSICLK>; - status = "disabled"; - }; }; mdio0: mdio@1e650000 { @@ -606,6 +586,25 @@ ranges = <0 0x1e78a000 0x1000>; }; + fsim0: fsi@1e79b000 { + compatible = "aspeed,ast2600-fsi-master", "fsi-master"; + reg = <0x1e79b000 0x94>; + interrupts = ; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_fsi1_default>; + clocks = <&syscon ASPEED_CLK_GATE_FSICLK>; + status = "disabled"; + }; + + fsim1: fsi@1e79b100 { + compatible = "aspeed,ast2600-fsi-master", "fsi-master"; + reg = <0x1e79b100 0x94>; + interrupts = ; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_fsi2_default>; + clocks = <&syscon ASPEED_CLK_GATE_FSICLK>; + status = "disabled"; + }; }; }; };