From patchwork Thu Jun 25 18:21:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 198478 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DD27C433E0 for ; Thu, 25 Jun 2020 18:21:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1EBFD207FC for ; Thu, 25 Jun 2020 18:21:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="RWRUbWB9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390548AbgFYSV3 (ORCPT ); Thu, 25 Jun 2020 14:21:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54710 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389648AbgFYSV1 (ORCPT ); Thu, 25 Jun 2020 14:21:27 -0400 Received: from mail-ed1-x542.google.com (mail-ed1-x542.google.com [IPv6:2a00:1450:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 488EBC08C5C1; Thu, 25 Jun 2020 11:21:26 -0700 (PDT) Received: by mail-ed1-x542.google.com with SMTP id h28so4974851edz.0; Thu, 25 Jun 2020 11:21:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iJGympPKw67tO36mbXPcyOIl3ANw6uW2ZpXFsuV8doQ=; b=RWRUbWB9BVsaDryerk8NJOwWvOUFTRXH07sMAp1cF/bCv2Ipdjvlr2a/cHw8J33TiO Ih/XjozpkshaEJyWyn0wzVDISXNaWnXEmBpD+eqQTGiYPO2/H3loKBl2GOegmq6HUNPR pfPcvitrLTe+21+YdRPpl5tL1vpIhc+LF/E9mvnwhixKnQF8d50y+Z9VVF4AXx6Eexbx RoxYXOzgaX5oh3uQheLAVeRqra2QfQBbreMvEs65fFGK3cZTgkX2ZEWevy55UaHiPm7B wNEVqtNEj68K0qNkwjnWs/ttns5zwlzQLGwmdRMXVLJX3sT4X3TF/5EoqF+ouOhiS40T WNRQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iJGympPKw67tO36mbXPcyOIl3ANw6uW2ZpXFsuV8doQ=; b=p2+r19cy5uCEg+AqYn+oJKXHN8doBn3ZbFWqoOGAyWCUS3msyl82BIu1NantiXGgkj h7ks7CaBlO1jotA2b2jXnKLIcNioTm2scW3tQSOfpgDIiSQqzNKTHWniSNTr3QrOIUx2 +YXXgww8l4tTAs0hs+4F61pfAc3S/xVOPlgAC6SUbo2/XgT6rdTnH7RG6MaqkHCu4g5i RSMq/nUJci8lt+qUMy326AQdiiK4uL7u1dLXlnMqGJxUlZy6dhWDljoYEyhxkHloGvVf 9CN1zBlYo8YGsnAkUMtbr35gXvst4X6KAoTIDacIMLki5gpxwnCl2+b7yzuoVbiI5ov1 9oJQ== X-Gm-Message-State: AOAM532XeHRLJ7vuGfjkeTQz2FXLi+XE7X+k75Zi6maXHPxO3K83Q/p2 vSARsphtIPyWDzhEu/YNkyA= X-Google-Smtp-Source: ABdhPJyTyM3kxzuNbaih+nDk5LqfJtFj+TdMG+3lBY0UiJLEreJtHvpGe/kjnyTlrX2mlpQDKadl3A== X-Received: by 2002:a50:fa8d:: with SMTP id w13mr33781336edr.324.1593109285001; Thu, 25 Jun 2020 11:21:25 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id lm22sm1523448ejb.109.2020.06.25.11.21.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 11:21:24 -0700 (PDT) From: Konrad Dybcio To: skrzynka@konradybcio.pl Cc: Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Kees Cook , Anton Vorontsov , Colin Cross , Tony Luck , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 01/13] arm64: dts: qcom: msm8992: Modernize the DTS style Date: Thu, 25 Jun 2020 20:21:05 +0200 Message-Id: <20200625182118.131476-2-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200625182118.131476-1-konradybcio@gmail.com> References: <20200625182118.131476-1-konradybcio@gmail.com> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Following changes have been made: - remove name, compatible and msm-id - wrap clocks in clocks{} - order nodes by name and by address - clock_gcc -> gcc - msmgpio -> tlmm - retire msm8992-pins.dtsi - add some of the missing pins - make comments C-style - make apcs a mailbox Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/msm8992-pins.dtsi | 90 -------- arch/arm64/boot/dts/qcom/msm8992.dtsi | 246 ++++++++++++++------- 2 files changed, 168 insertions(+), 168 deletions(-) delete mode 100644 arch/arm64/boot/dts/qcom/msm8992-pins.dtsi diff --git a/arch/arm64/boot/dts/qcom/msm8992-pins.dtsi b/arch/arm64/boot/dts/qcom/msm8992-pins.dtsi deleted file mode 100644 index c543c718c22d..000000000000 --- a/arch/arm64/boot/dts/qcom/msm8992-pins.dtsi +++ /dev/null @@ -1,90 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright (c) 2013-2015, The Linux Foundation. All rights reserved. - */ - -&msmgpio { - blsp1_uart2_default: blsp1_uart2_default { - pinmux { - function = "blsp_uart2"; - pins = "gpio4", "gpio5"; - }; - pinconf { - pins = "gpio4", "gpio5"; - drive-strength = <16>; - bias-disable; - }; - }; - - blsp1_uart2_sleep: blsp1_uart2_sleep { - pinmux { - function = "gpio"; - pins = "gpio4", "gpio5"; - }; - pinconf { - pins = "gpio4", "gpio5"; - drive-strength = <2>; - bias-pull-down; - }; - }; - - /* 0-3 for sdc1 4-6 for sdc2 */ - /* Order of pins */ - /* SDC1: CLK -> 0, CMD -> 1, DATA -> 2, RCLK -> 3 */ - /* SDC2: CLK -> 4, CMD -> 5, DATA -> 6 */ - sdc1_clk_on: clk-on { - pinconf { - pins = "sdc1_clk"; - bias-disable = <0>; /* No pull */ - drive-strength = <16>; /* 16mA */ - }; - }; - - sdc1_clk_off: clk-off { - pinconf { - pins = "sdc1_clk"; - bias-disable = <0>; /* No pull */ - drive-strength = <2>; /* 2mA */ - }; - }; - - sdc1_cmd_on: cmd-on { - pinconf { - pins = "sdc1_cmd"; - bias-pull-up; - drive-strength = <8>; - }; - }; - - sdc1_cmd_off: cmd-off { - pinconf { - pins = "sdc1_cmd"; - bias-pull-up = <0x3>; /* same as 3.10 ?? */ - drive-strength = <2>; /* 2mA */ - }; - }; - - sdc1_data_on: data-on { - pinconf { - pins = "sdc1_data"; - bias-pull-up; - drive-strength = <8>; /* 8mA */ - }; - }; - - sdc1_data_off: data-off { - pinconf { - pins = "sdc1_data"; - bias-pull-up; - drive-strength = <2>; - }; - }; - - sdc1_rclk_on: rclk-on { - bias-pull-down; /* pull down */ - }; - - sdc1_rclk_off: rclk-off { - bias-pull-down; /* pull down */ - }; -}; diff --git a/arch/arm64/boot/dts/qcom/msm8992.dtsi b/arch/arm64/boot/dts/qcom/msm8992.dtsi index d41ba1ef687a..43b2e4cd26f0 100644 --- a/arch/arm64/boot/dts/qcom/msm8992.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8992.dtsi @@ -6,10 +6,6 @@ #include / { - model = "Qualcomm Technologies, Inc. MSM 8992"; - compatible = "qcom,msm8992"; - // msm-id needed by bootloader for selecting correct blob - qcom,msm-id = <251 0>, <252 0>; interrupt-parent = <&intc>; #address-cells = <2>; @@ -40,35 +36,35 @@ L2_0: l2-cache { }; }; - timer { - compatible = "arm,armv8-timer"; - interrupts = , - , - , - ; - }; + clocks { + xo_board: xo_board { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <19200000>; + }; - xo_board: xo_board { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <19200000>; + sleep_clk: sleep_clk { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <32768>; + }; }; - sleep_clk: sleep_clk { - compatible = "fixed-clock"; - #clock-cells = <0>; - clock-frequency = <32768>; + memory { + device_type = "memory"; + /* We expect the bootloader to fill in the reg */ + reg = <0 0 0 0>; }; - vreg_vph_pwr: vreg-vph-pwr { - compatible = "regulator-fixed"; - status = "okay"; - regulator-name = "vph-pwr"; - - regulator-min-microvolt = <3600000>; - regulator-max-microvolt = <3600000>; + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; - regulator-always-on; + smem_region: smem@6a00000 { + reg = <0x0 0x6a00000 0x0 0x200000>; + no-map; + }; }; sfpb_mutex: hwmutex { @@ -98,9 +94,10 @@ intc: interrupt-controller@f9000000 { <0xf9002000 0x1000>; }; - apcs: syscon@f900d000 { - compatible = "syscon"; + apcs: mailbox@f900d000 { + compatible = "qcom,msm8994-apcs-kpss-global", "syscon"; reg = <0xf900d000 0x2000>; + #mbox-cells = <1>; }; timer@f9020000 { @@ -161,40 +158,6 @@ frame@f9028000 { }; }; - restart@fc4ab000 { - compatible = "qcom,pshold"; - reg = <0xfc4ab000 0x4>; - }; - - msmgpio: pinctrl@fd510000 { - compatible = "qcom,msm8994-pinctrl"; - reg = <0xfd510000 0x4000>; - interrupts = ; - gpio-controller; - gpio-ranges = <&msmgpio 0 0 146>; - #gpio-cells = <2>; - interrupt-controller; - #interrupt-cells = <2>; - }; - - blsp1_uart2: serial@f991e000 { - compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; - reg = <0xf991e000 0x1000>; - interrupts = ; - status = "disabled"; - clock-names = "core", "iface"; - clocks = <&clock_gcc GCC_BLSP1_UART2_APPS_CLK>, - <&clock_gcc GCC_BLSP1_AHB_CLK>; - }; - - clock_gcc: clock-controller@fc400000 { - compatible = "qcom,gcc-msm8994"; - #clock-cells = <1>; - #reset-cells = <1>; - #power-domain-cells = <1>; - reg = <0xfc400000 0x2000>; - }; - sdhci1: mmc@f9824900 { compatible = "qcom,sdhci-msm-v4"; reg = <0xf9824900 0x1a0>, <0xf9824000 0x800>; @@ -204,8 +167,8 @@ sdhci1: mmc@f9824900 { ; interrupt-names = "hc_irq", "pwr_irq"; - clocks = <&clock_gcc GCC_SDCC1_APPS_CLK>, - <&clock_gcc GCC_SDCC1_AHB_CLK>; + clocks = <&gcc GCC_SDCC1_APPS_CLK>, + <&gcc GCC_SDCC1_AHB_CLK>; clock-names = "core", "iface"; pinctrl-names = "default", "sleep"; @@ -220,32 +183,141 @@ sdhci1: mmc@f9824900 { status = "okay"; }; + blsp1_uart2: serial@f991e000 { + compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; + reg = <0xf991e000 0x1000>; + interrupts = ; + clock-names = "core", "iface"; + clocks = <&gcc GCC_BLSP1_UART2_APPS_CLK>, + <&gcc GCC_BLSP1_AHB_CLK>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&blsp1_uart2_default>; + pinctrl-1 = <&blsp1_uart2_sleep>; + status = "disabled"; + }; + + gcc: clock-controller@fc400000 { + compatible = "qcom,gcc-msm8994"; + #clock-cells = <1>; + #reset-cells = <1>; + #power-domain-cells = <1>; + reg = <0xfc400000 0x2000>; + }; + rpm_msg_ram: memory@fc428000 { compatible = "qcom,rpm-msg-ram"; reg = <0xfc428000 0x4000>; }; + restart@fc4ab000 { + compatible = "qcom,pshold"; + reg = <0xfc4ab000 0x4>; + }; + sfpb_mutex_regs: syscon@fd484000 { #address-cells = <1>; #size-cells = <1>; compatible = "syscon"; reg = <0xfd484000 0x400>; }; - }; - memory { - device_type = "memory"; - reg = <0 0 0 0>; // bootloader will update - }; + tlmm: pinctrl@fd510000 { + compatible = "qcom,msm8994-pinctrl"; + reg = <0xfd510000 0x4000>; + interrupts = ; + gpio-controller; + gpio-ranges = <&tlmm 0 0 146>; + #gpio-cells = <2>; + interrupt-controller; + #interrupt-cells = <2>; - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; + blsp1_uart2_default: blsp1-uart2-default { + function = "blsp_uart2"; + pins = "gpio4", "gpio5"; + drive-strength = <16>; + bias-disable; + }; - smem_region: smem@6a00000 { - reg = <0x0 0x6a00000 0x0 0x200000>; - no-map; + blsp1_uart2_sleep: blsp1-uart2-sleep { + function = "gpio"; + pins = "gpio4", "gpio5"; + drive-strength = <2>; + bias-pull-down; + }; + + sdc1_clk_on: clk-on { + pins = "sdc1_clk"; + bias-disable; + drive-strength = <6>; + }; + + sdc1_clk_off: clk-off { + pins = "sdc1_clk"; + bias-disable; + drive-strength = <2>; + }; + + sdc1_cmd_on: cmd-on { + pins = "sdc1_cmd"; + bias-pull-up; + drive-strength = <6>; + }; + + sdc1_cmd_off: cmd-off { + pins = "sdc1_cmd"; + bias-pull-up; + drive-strength = <2>; + }; + + sdc1_data_on: data-on { + pins = "sdc1_data"; + bias-pull-up; + drive-strength = <6>; + }; + + sdc1_data_off: data-off { + pins = "sdc1_data"; + bias-pull-up; + drive-strength = <2>; + }; + + sdc1_rclk_on: rclk-on { + pins = "sdc1_rclk"; + bias-pull-down; + }; + + sdc1_rclk_off: rclk-off { + pins = "sdc1_rclk"; + bias-pull-down; + }; + + i2c2_default: i2c2-default { + function = "blsp_i2c2"; + pins = "gpio6", "gpio7"; + drive-strength = <2>; + bias-disable; + }; + + i2c2_sleep: i2c2-sleep { + function = "gpio"; + pins = "gpio6", "gpio7"; + drive-strength = <2>; + bias-disable; + }; + + i2c6_default: i2c6-default { + function = "blsp_i2c6"; + pins = "gpio28", "gpio27"; + drive-strength = <2>; + bias-disable; + }; + + i2c6_sleep: i2c6-sleep { + function = "gpio"; + pins = "gpio28", "gpio27"; + drive-strength = <2>; + bias-disable; + }; }; }; @@ -264,6 +336,24 @@ rpm_requests: rpm-requests { }; }; }; + + timer { + compatible = "arm,armv8-timer"; + interrupts = , + , + , + ; + }; + + vreg_vph_pwr: vreg-vph-pwr { + compatible = "regulator-fixed"; + status = "okay"; + regulator-name = "vph-pwr"; + + regulator-min-microvolt = <3600000>; + regulator-max-microvolt = <3600000>; + + regulator-always-on; + }; }; -#include "msm8992-pins.dtsi" From patchwork Thu Jun 25 18:21:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 198472 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D091AC433E0 for ; Thu, 25 Jun 2020 18:22:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AC140207FC for ; Thu, 25 Jun 2020 18:22:51 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lw/G9AZ0" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406150AbgFYSWq (ORCPT ); Thu, 25 Jun 2020 14:22:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390556AbgFYSV3 (ORCPT ); Thu, 25 Jun 2020 14:21:29 -0400 Received: from mail-ej1-x643.google.com (mail-ej1-x643.google.com [IPv6:2a00:1450:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E8479C08C5C1; Thu, 25 Jun 2020 11:21:28 -0700 (PDT) Received: by mail-ej1-x643.google.com with SMTP id w6so6888024ejq.6; Thu, 25 Jun 2020 11:21:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+puFNw9Af4Mq8TedQJihgmoj5SF8nSnYlnfkgvsEedk=; b=lw/G9AZ0JhLp6mKFGbUXgOhKEJq6WIJ7cIQOw5MJE0Yux3vjHzXe8U0oR1NAWc0cLy La6AtEa19/sN5MXoc8F06zOdtlkueZ1HPwZiMD1IZ7WGO4X85dOvDSfc9cKkm+XjyQA6 cwGTTnYWb3gvJkKgCCLpHpU2LNuKmOLac9/FW30w9TRTUP9FqQJMOcNva+kyU1R6vVAo B2+c2BEdIusCEVNGCdCJ/n9yP/LOkb/pjTXkh/9KYYCtJ3F2ppyZPc6p/8HLjj7xCoGf dfYoaV1xG/2/hRXH6FFX/BgM5EbFodVsVdE4abAdYm0Qh1Ujw/CKfPIoV6M56ENb3oOS zb/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+puFNw9Af4Mq8TedQJihgmoj5SF8nSnYlnfkgvsEedk=; b=XjZqrUiFSrJtk5XBtNFjYNAaTIKBqMlOLYOpUwmNrjNhOkz85yRqAq7QVRktXd351p NQ+xYIc3hriLLOMFqVZoh4ECEuNA9Zf3khe9ekyVG+joKFRX1nlHegm8TkFMGZYHQR2a UawdaeZeFxk11Aix5OWG2bLDFFlpFJjfGBQ+RYD8H+jdG5UE1vipz7vPYIGZajQK5+CH ebQ/EgLWtoriS6o762VO694pqsTD3sEZ11I3I01KcreSaIQd32hLPVFmdAU2W/aWzf8/ ME4qcvseDN/xGv4x33pmKI6hgn9IBMjISEwZs4j1jJJejN09EPNewDRUh/DpFebwZtpI 9l7w== X-Gm-Message-State: AOAM5329FJHIBCk9iM5M/MS2yIZN5xszhiVSLE/PRTNg29cP5Uu5uV6W NqbRUZU8aI7TYHNWYjS/LHA= X-Google-Smtp-Source: ABdhPJwYbZsIVqcWEZ6FdDlOUbZjB+V3Gp3dC4XjE1TgMUPnOnF6TRL429WIWYcwe8CIBGAOyCkohA== X-Received: by 2002:a17:906:3042:: with SMTP id d2mr9618978ejd.420.1593109287647; Thu, 25 Jun 2020 11:21:27 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id lm22sm1523448ejb.109.2020.06.25.11.21.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 11:21:27 -0700 (PDT) From: Konrad Dybcio To: skrzynka@konradybcio.pl Cc: Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Kees Cook , Anton Vorontsov , Colin Cross , Tony Luck , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 02/13] arm64: dts: qcom: msm8992: Fix SDHCI1 Date: Thu, 25 Jun 2020 20:21:06 +0200 Message-Id: <20200625182118.131476-3-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200625182118.131476-1-konradybcio@gmail.com> References: <20200625182118.131476-1-konradybcio@gmail.com> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This commit ensures the correct IRQ type is set and disables the device by default. The mmc-hs400-1_8v property is also moved to Bullhead as it might not be present on all boards. The node has been renamed to sdhci@ instead of mmc@ and the phandle was changed to sdhc_1 to comply with the newer DTS style. Signed-off-by: Konrad Dybcio --- .../boot/dts/qcom/msm8992-bullhead-rev-101.dts | 6 ++++++ arch/arm64/boot/dts/qcom/msm8992.dtsi | 16 +++++++++------- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts index a2de69292d28..1061fd5404aa 100644 --- a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts +++ b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts @@ -271,3 +271,9 @@ pm8994_l32: l32 { }; }; }; + +&sdhc_1 { + status = "okay"; + + mmc-hs400-1_8v; +}; diff --git a/arch/arm64/boot/dts/qcom/msm8992.dtsi b/arch/arm64/boot/dts/qcom/msm8992.dtsi index 43b2e4cd26f0..8ef1cb8ba8ef 100644 --- a/arch/arm64/boot/dts/qcom/msm8992.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8992.dtsi @@ -158,18 +158,19 @@ frame@f9028000 { }; }; - sdhci1: mmc@f9824900 { + sdhc_1: sdhci@f9824900 { compatible = "qcom,sdhci-msm-v4"; reg = <0xf9824900 0x1a0>, <0xf9824000 0x800>; reg-names = "hc_mem", "core_mem"; - interrupts = , - ; + interrupts = , + ; interrupt-names = "hc_irq", "pwr_irq"; clocks = <&gcc GCC_SDCC1_APPS_CLK>, - <&gcc GCC_SDCC1_AHB_CLK>; - clock-names = "core", "iface"; + <&gcc GCC_SDCC1_AHB_CLK>, + <&xo_board>; + clock-names = "core", "iface", "xo"; pinctrl-names = "default", "sleep"; pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on @@ -179,8 +180,9 @@ sdhci1: mmc@f9824900 { regulator-always-on; bus-width = <8>; - mmc-hs400-1_8v; - status = "okay"; + non-removable; + + status = "disabled"; }; blsp1_uart2: serial@f991e000 { From patchwork Thu Jun 25 18:21:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 198477 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4F79FC433DF for ; Thu, 25 Jun 2020 18:21:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2D83020781 for ; Thu, 25 Jun 2020 18:21:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PEobQgKo" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390669AbgFYSVd (ORCPT ); Thu, 25 Jun 2020 14:21:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54724 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389648AbgFYSVb (ORCPT ); Thu, 25 Jun 2020 14:21:31 -0400 Received: from mail-ej1-x642.google.com (mail-ej1-x642.google.com [IPv6:2a00:1450:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 75654C08C5C1; Thu, 25 Jun 2020 11:21:31 -0700 (PDT) Received: by mail-ej1-x642.google.com with SMTP id a1so6852689ejg.12; Thu, 25 Jun 2020 11:21:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wyyTfoYKUal+Im2XFp9aLfEoAp0H4cTyYoV6q1T4GSs=; b=PEobQgKoEMEyUg8apMi927oZD8vIUM5Vx61Zcb0XYEKgk7OCQy44rz/H7p364Aw1QM KX2XuJls+eqCLGFYYJOTeaQvC7D5ejt2X559pNy16Nw55LETU6LXHeID9ICxFNTPge72 9wiUrKOIXeoajpUDMsJ1Fum9SsHkdbdsyIda3OLUBv8IhvFmql7WFGhMVgHeiBbh28iE vxE1I/dCJ0f8Z+7NuEt73SwRQ0Vj1YjsOEKbKstrGlNspcMlSD9yTY9GXD9kTBa1Ea85 TmLntu4Kg2ePJ7Tth8AFgOoLtfc/kxstLf9yGSdfUeuEo7zZ82zzcMnyVwfD0PXy5wBI 94dQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wyyTfoYKUal+Im2XFp9aLfEoAp0H4cTyYoV6q1T4GSs=; b=ablDQX4AXMqrAjO4LtEnUzYtQ/hEJumDxkHWcdwmPWwdY4VpFdG3m15gooUS7nNhlt e5vVAc4kU1M/LE2gl30sCylVlYsTvW5s2PalqpooxztK5RBeTJZjF/+cxJJOPYdvB4fR sCnGZBvqdd9HDf6JcPcF4vZUOSHMiOC78M4JgU5sAXE8U67xDj+JunVpC61laaDQJ6Wb EWFGnXO2PiO1VJoOlnuZYJ8MUyRezSr/8Q0gPZ/qQqv+JFCzVVmvk9D+kVbzZgKazehA 079Cqe2pJrAyNds37ByiYv+N2vRUQQ0lz3+fKOk2NcCrGgcoOdkQ+ri2EmfAbs6C+MMp 74DQ== X-Gm-Message-State: AOAM532X+a0P80onay28AVsWZUKpr8VrDU0zLJLKZJ6LHgxoh3ERgt/g aqNPzJPpdGrpPL6rWWrtrW4= X-Google-Smtp-Source: ABdhPJxnomW7lt+1hVr9XadS5o1FSgjDDK7gmE17NGMsjJSOo+qmfY0FFhWDbsA3eiCykt4+H6oMEg== X-Received: by 2002:a17:906:ecef:: with SMTP id qt15mr30155704ejb.91.1593109290233; Thu, 25 Jun 2020 11:21:30 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id lm22sm1523448ejb.109.2020.06.25.11.21.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 11:21:29 -0700 (PDT) From: Konrad Dybcio To: skrzynka@konradybcio.pl Cc: Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Kees Cook , Anton Vorontsov , Colin Cross , Tony Luck , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 03/13] arm64: dts: qcom: bullhead: Add qcom,msm-id Date: Thu, 25 Jun 2020 20:21:07 +0200 Message-Id: <20200625182118.131476-4-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200625182118.131476-1-konradybcio@gmail.com> References: <20200625182118.131476-1-konradybcio@gmail.com> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add the property required for the bootloader to select the correct device tree blob. It has been removed from the SoC device tree as it should be set on a per-device basis. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts index 1061fd5404aa..4f70681e730d 100644 --- a/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts +++ b/arch/arm64/boot/dts/qcom/msm8992-bullhead-rev-101.dts @@ -11,6 +11,7 @@ / { model = "LG Nexus 5X"; compatible = "lg,bullhead", "qcom,msm8992"; /* required for bootloader to select correct board */ + qcom,msm-id = <251 0>, <252 0>; qcom,board-id = <0xb64 0>; qcom,pmic-id = <0x10009 0x1000A 0x0 0x0>; From patchwork Thu Jun 25 18:21:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 198476 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0DB81C433DF for ; Thu, 25 Jun 2020 18:21:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DF61520781 for ; Thu, 25 Jun 2020 18:21:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XByxbr/8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403865AbgFYSVo (ORCPT ); Thu, 25 Jun 2020 14:21:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403814AbgFYSVk (ORCPT ); Thu, 25 Jun 2020 14:21:40 -0400 Received: from mail-ej1-x643.google.com (mail-ej1-x643.google.com [IPv6:2a00:1450:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 87332C08C5DB; Thu, 25 Jun 2020 11:21:39 -0700 (PDT) Received: by mail-ej1-x643.google.com with SMTP id y10so6907246eje.1; Thu, 25 Jun 2020 11:21:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=x3wtRHMZ/MZ4FcDZUnjrib+cjt+ls4zlIHiLzlwHN88=; b=XByxbr/8chpCA7iOHS21vnd1JzDFLUDDP6oyQKI/12dB4WSP3KTj5brktv/58PPzX/ 78Hd8X+AsR77JlrWSyEl7GLD+RuXtgQYojQZM0ZK+d7JnFbMMDmz7sCen86eazrXASIZ 0OD5E/PA7rIlnGw3LI5lB6XL79qQwIbGKCe9gcF7LbG8UQYkh99oB8Pj0xpYeVzS9Bvq kD88M52ZNl1kbMzldqubJWloFFGIMKsQ1z6YvIEUqtEwjKl1nzhlck0HrroKJ19bcNUA Mx+AAmQ9D0+2FChhcGGpoAjKGYR4K5zuHuzEUJC8DAZcQWAlc32oTbiJAO8Ly89X4iEu 661Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=x3wtRHMZ/MZ4FcDZUnjrib+cjt+ls4zlIHiLzlwHN88=; b=VBq3jfKo1qnQoT4BbDIPsNi7n4Yt/l71NE6yBgGD9o+TW7h6zx4AGdBZpdzahzTOtG UEofcvhhxe+dCJJbvGlupwm5YXxS/fuFheSF2MJCF0zGvn01ZZvjY5WI4ZpCBdaIdjhR CDyVr8PRzoQ4X/SkFpyWlDbs+SAX2nSHkX+UA52BQW7YpMGyvX8Nln45yXAl2h47ims7 iQKAj6juuxwaFct8MMkTMA8m/5ih5a2OZh1JNQ9VMsP6fbcYWnEwnaoqmDxY75MiegCP wURzIpDgQPBl6f7OY9rf4xjHUeBD+xzVyOWXKQbrNj56qXRPElv6kZnT1OB4cbx84iMC UIgw== X-Gm-Message-State: AOAM532soW4gDgimeg4kW4+eV+UEr3EJ1Dd2USNFqhrKZoI4F5NKP+7d c6+aeafOOvmKVahndPgdoTA= X-Google-Smtp-Source: ABdhPJyiqouyfvh9F0EHdyStVHCFJzAYzvJl96YFnjIHnBN9+8qKIcpL95n6ql95WdowvBydLtV6VA== X-Received: by 2002:a17:906:7751:: with SMTP id o17mr32132825ejn.111.1593109298262; Thu, 25 Jun 2020 11:21:38 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id lm22sm1523448ejb.109.2020.06.25.11.21.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 11:21:37 -0700 (PDT) From: Konrad Dybcio To: skrzynka@konradybcio.pl Cc: Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Kees Cook , Anton Vorontsov , Colin Cross , Tony Luck , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 06/13] arm64: dts: qcom: msm8992: Add a SCM node Date: Thu, 25 Jun 2020 20:21:10 +0200 Message-Id: <20200625182118.131476-7-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200625182118.131476-1-konradybcio@gmail.com> References: <20200625182118.131476-1-konradybcio@gmail.com> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/msm8992.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/msm8992.dtsi b/arch/arm64/boot/dts/qcom/msm8992.dtsi index f780cd39ded6..aee33ed61858 100644 --- a/arch/arm64/boot/dts/qcom/msm8992.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8992.dtsi @@ -118,6 +118,12 @@ sleep_clk: sleep_clk { }; }; + firmware { + scm { + compatible = "qcom,scm-msm8994", "qcom,scm"; + }; + }; + memory { device_type = "memory"; /* We expect the bootloader to fill in the reg */ From patchwork Thu Jun 25 18:21:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 198473 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0FBD6C433E0 for ; Thu, 25 Jun 2020 18:22:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D821A207FC for ; Thu, 25 Jun 2020 18:22:29 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="phgQEmZB" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2403936AbgFYSVr (ORCPT ); Thu, 25 Jun 2020 14:21:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2403908AbgFYSVp (ORCPT ); Thu, 25 Jun 2020 14:21:45 -0400 Received: from mail-ej1-x642.google.com (mail-ej1-x642.google.com [IPv6:2a00:1450:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C71B1C08C5DB; Thu, 25 Jun 2020 11:21:44 -0700 (PDT) Received: by mail-ej1-x642.google.com with SMTP id i14so6873732ejr.9; Thu, 25 Jun 2020 11:21:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nINX/kfwXFeE0ZC5NuendZlvDPr7E/82LokYi5uJ2C8=; b=phgQEmZBAGHvF6Yor9+Ner7UPhLMBjeDoTBnlcP5hKjw+/FXyBRbqeQO7UuM4I/fwC m4bUArLisV1M8EBGkYqXiB+rVR+ytGS+Pph9ROOmYIxq3ho0Ui27MvYSwhW0ezhQG2zx Dse2e/Ns0HQnS7ZRh9a4Ucej7p2hA5fMqM18JM7nKoxLYaaQgjypvGO8SNnX9aD1+BB5 o2HFiZ+5Ap1Tsuk624bOpisg+utjMrjJcW274L30jZkjGARpu+AWcSLiEj6vYkv9xyTL 5tuH/4CaBrsU+V8fjYnRgLvOW2uq8rtbe+Mv7uVv4j8dnOwni05caefJdE1tm8XyfM7m qFSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nINX/kfwXFeE0ZC5NuendZlvDPr7E/82LokYi5uJ2C8=; b=dQ8/XfiM3ohPPcKY06nkftYBwCe/cmWjMEAdHj7E8ikLK67PiONTt61yuWRIUQPkp5 SuG4nUCClDBKSjhtRCVU+cjyGN+3/fG/4P30ro8TgazhhpFORRFVH4FSio2Zssqze6s2 anPzCFiotYWYacssI8KcanWwBWu3eYbmvnnNr2nEXqpg5M4fqbatiCrImbDw9qwC8xcI OEXXfO3MeS/J+KTgwr+cQghCdPQ6e5PGLpxR3bgvuE77QZGo+TJokNc7haWqDlfHCrKf DKIDhUGShekLwLc66+SCnaV6PAE6vwyZUJTYcYwfkw4wjhVvAzkjfzeK6XEH0q1xBG6Y er1Q== X-Gm-Message-State: AOAM532c/a5Hcd+P8jtw6EybYtBxr/qfgLAEeEEDE6jfr89dZOe4omNt npcp8+2IqoF6MvlEBWvf7ls= X-Google-Smtp-Source: ABdhPJySgXDEOreTE6V/aBq8JMuILzmOefyxBwgH84GXUxUtaHRcMT4JFvzsjFHIg2QsVtNzQZUeqw== X-Received: by 2002:a17:907:6fc:: with SMTP id yh28mr20251363ejb.267.1593109303497; Thu, 25 Jun 2020 11:21:43 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id lm22sm1523448ejb.109.2020.06.25.11.21.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 11:21:43 -0700 (PDT) From: Konrad Dybcio To: skrzynka@konradybcio.pl Cc: Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Kees Cook , Anton Vorontsov , Colin Cross , Tony Luck , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 08/13] arm64: dts: qcom: msm8992: Add BLSP2_UART2 and I2C nodes Date: Thu, 25 Jun 2020 20:21:12 +0200 Message-Id: <20200625182118.131476-9-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200625182118.131476-1-konradybcio@gmail.com> References: <20200625182118.131476-1-konradybcio@gmail.com> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add support for I2C to enable support for peripherals such as touchscreens or sensors. Also add BLSP_UART2 interface. Please note that the naming scheme follows downstream and as abominable as it is, that's what we get. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/msm8992.dtsi | 153 ++++++++++++++++++++++++++ 1 file changed, 153 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/msm8992.dtsi b/arch/arm64/boot/dts/qcom/msm8992.dtsi index acce7be22e50..e8b801813f14 100644 --- a/arch/arm64/boot/dts/qcom/msm8992.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8992.dtsi @@ -272,6 +272,101 @@ blsp1_uart2: serial@f991e000 { status = "disabled"; }; + blsp_i2c2: i2c@f9924000 { + compatible = "qcom,i2c-qup-v2.2.1"; + reg = <0xf9924000 0x500>; + interrupts = ; + clocks = <&gcc GCC_BLSP1_AHB_CLK>, + <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>; + clock-names = "iface", "core"; + clock-frequency = <400000>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2c2_default>; + pinctrl-1 = <&i2c2_sleep>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + /* Somebody was very creative with their numbering scheme downstream... */ + + blsp_i2c13: i2c@f9927000 { + compatible = "qcom,i2c-qup-v2.2.1"; + reg = <0xf9927000 0x500>; + interrupts = ; + clocks = <&gcc GCC_BLSP1_AHB_CLK>, + <&gcc GCC_BLSP1_QUP5_I2C_APPS_CLK>; + clock-names = "iface", "core"; + clock-frequency = <400000>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2c13_default>; + pinctrl-1 = <&i2c13_sleep>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + blsp_i2c6: i2c@f9928000 { + compatible = "qcom,i2c-qup-v2.2.1"; + reg = <0xf9928000 0x500>; + interrupts = ; + clocks = <&gcc GCC_BLSP1_AHB_CLK>, + <&gcc GCC_BLSP1_QUP6_I2C_APPS_CLK>; + clock-names = "iface", "core"; + clock-frequency = <400000>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2c6_default>; + pinctrl-1 = <&i2c6_sleep>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + blsp2_uart2: serial@f995e000 { + compatible = "qcom,msm-uartdm-v1.4", "qcom,msm-uartdm"; + reg = <0xf995e000 0x1000>; + interrupt = ; + clock-names = "core", "iface"; + clocks = <&gcc GCC_BLSP2_UART2_APPS_CLK>, + <&gcc GCC_BLSP2_AHB_CLK>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&blsp2_uart2_default>; + pinctrl-1 = <&blsp2_uart2_sleep>; + status = "disabled"; + }; + + blsp_i2c7: i2c@f9963000 { + compatible = "qcom,i2c-qup-v2.2.1"; + reg = <0xf9963000 0x500>; + interrupts = ; + clocks = <&gcc GCC_BLSP2_AHB_CLK>, + <&gcc GCC_BLSP2_QUP1_I2C_APPS_CLK>; + clock-names = "iface", "core"; + clock-frequency = <400000>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2c7_default>; + pinctrl-1 = <&i2c7_sleep>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + + blsp_i2c5: i2c@f9967000 { + compatible = "qcom,i2c-qup-v2.2.1"; + reg = <0xf9967000 0x500>; + interrupts = ; + clocks = <&gcc GCC_BLSP2_AHB_CLK>, + <&gcc GCC_BLSP2_QUP5_I2C_APPS_CLK>; + clock-names = "iface", "core"; + clock-frequency = <100000>; + pinctrl-names = "default", "sleep"; + pinctrl-0 = <&i2c5_default>; + pinctrl-1 = <&i2c5_sleep>; + #address-cells = <1>; + #size-cells = <0>; + status = "disabled"; + }; + gcc: clock-controller@fc400000 { compatible = "qcom,gcc-msm8994"; #clock-cells = <1>; @@ -337,6 +432,20 @@ blsp1_uart2_sleep: blsp1-uart2-sleep { bias-pull-down; }; + blsp2_uart2_default: blsp2-uart2-default { + function = "blsp_uart8"; + pins = "gpio45", "gpio46", "gpio47", "gpio48"; + drive-strength = <16>; + bias-disable; + }; + + blsp2_uart2_sleep: blsp2-uart2-sleep { + function = "gpio"; + pins = "gpio45", "gpio46", "gpio47", "gpio48"; + drive-strength = <2>; + bias-pull-down; + }; + sdc1_clk_on: clk-on { pins = "sdc1_clk"; bias-disable; @@ -397,6 +506,21 @@ i2c2_sleep: i2c2-sleep { bias-disable; }; + i2c5_default: i2c5-default { + /* Don't be fooled! Nobody knows the reason why though... */ + function = "blsp_i2c11"; + pins = "gpio83", "gpio84"; + drive-strength = <2>; + bias-disable; + }; + + i2c5_sleep: i2c5-sleep { + function = "gpio"; + pins = "gpio83", "gpio84"; + drive-strength = <2>; + bias-disable; + }; + i2c6_default: i2c6-default { function = "blsp_i2c6"; pins = "gpio28", "gpio27"; @@ -410,6 +534,35 @@ i2c6_sleep: i2c6-sleep { drive-strength = <2>; bias-disable; }; + + i2c7_default: i2c7-default { + function = "blsp_i2c7"; + pins = "gpio43", "gpio44"; + drive-strength = <2>; + bias-disable; + }; + + i2c7_sleep: i2c7-sleep { + function = "gpio"; + pins = "gpio43", "gpio44"; + drive-strength = <2>; + bias-disable; + }; + + i2c13_default: i2c13-default { + /* Not a typo either. */ + function = "blsp_i2c5"; + pins = "gpio23", "gpio24"; + drive-strength = <2>; + bias-disable; + }; + + i2c13_sleep: i2c13-sleep { + function = "gpio"; + pins = "gpio23", "gpio24"; + drive-strength = <2>; + bias-disable; + }; }; }; From patchwork Thu Jun 25 18:21:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 198474 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39C89C433E2 for ; Thu, 25 Jun 2020 18:22:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1A0562081A for ; Thu, 25 Jun 2020 18:22:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ODFyvm5V" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404414AbgFYSVv (ORCPT ); Thu, 25 Jun 2020 14:21:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54788 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404171AbgFYSVu (ORCPT ); Thu, 25 Jun 2020 14:21:50 -0400 Received: from mail-ed1-x544.google.com (mail-ed1-x544.google.com [IPv6:2a00:1450:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D76ABC08C5DB; Thu, 25 Jun 2020 11:21:49 -0700 (PDT) Received: by mail-ed1-x544.google.com with SMTP id g1so4947891edv.6; Thu, 25 Jun 2020 11:21:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=A69JzujOnyhenXPlRXTW6BkPoGZ0iXxM/MOzTEanPgQ=; b=ODFyvm5V8bJa2FAJCCG3ScLpGvuqvyll5vw+2FS1j8/f3AMh3o/RBwmH0pAJmbooEA IHhRPcnmy7f7F9vB4FMkQdE8d/a+XdhkzH9FWOtKhKIcXLc9yHTn1SWLGMV4orkQNszE SqaApbEwBSw+7CUXs/uAi/PdTn76L6AF2BekoIxFeC87v0eExUhl9HrEhIhygrjhERYI IoSWfbGdrrYLC1TevvEKFO+uXY8fqzEDfPMVHn20vKZiA0ouzcTWZcs2/8C0i+F9hvjp e5WdAgTj2t0guBrdyf61r2FuTHFEN7cDEYJUkhnbxOSiGxnfsGvwepN+iNCj9SCk3GEo EPBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=A69JzujOnyhenXPlRXTW6BkPoGZ0iXxM/MOzTEanPgQ=; b=iabDMrgcxIYBEFEYjkow+AkraKystP1DT+9bhMk+ej0+w9fuzEC/ylFoGQtVuyzqaA 50dbOe9gL/vaI6RBs2NXVC05rVQASfes3nR2HAkoe9jGFN3lzWXNVSqS57pGqv8C62Sk 0wDJUIQyZeY0Asw80ULeGvYtq2LywnFSkLg4Xk0jSDTaZbrBpvufW4gI/EhLdWHuJtGr bdGeb1OoNKGdA4ZKJLplcG8+fQ1XW83krCz3sduuuILLBPceCBxsNKIB56YnS91S9lA4 khBDRThTJlehOKEgHtqY8SlTi/+kyzcRXV11djjDywWaUMkAA2F7ezgilVktYl79Vzzj kuyA== X-Gm-Message-State: AOAM531CJfxdq8cEq7q720DoL2/1jepsH302O9/5ITfo6ID0UIn8Plxl +hIkwhKmnzDscNgyHqnh8Is= X-Google-Smtp-Source: ABdhPJzmfvbOjx/IWB5RRMpXTfXgVoCKevHrkNt9wPBD16ZSLt4MMQH4HpoXMxfQErxEdfaFpeUGJg== X-Received: by 2002:a50:f413:: with SMTP id r19mr13324539edm.17.1593109308677; Thu, 25 Jun 2020 11:21:48 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id lm22sm1523448ejb.109.2020.06.25.11.21.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 11:21:48 -0700 (PDT) From: Konrad Dybcio To: skrzynka@konradybcio.pl Cc: Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Kees Cook , Anton Vorontsov , Colin Cross , Tony Luck , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 10/13] arm64: dts: qcom: msm8992: Add PSCI support. Date: Thu, 25 Jun 2020 20:21:14 +0200 Message-Id: <20200625182118.131476-11-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200625182118.131476-1-konradybcio@gmail.com> References: <20200625182118.131476-1-konradybcio@gmail.com> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org This SoC's firmware does not fully support the PSCI spec, but it's good enough to bring the cores up. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/msm8992.dtsi | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/msm8992.dtsi b/arch/arm64/boot/dts/qcom/msm8992.dtsi index c4c9a108ae1e..bc3acc0cf9bf 100644 --- a/arch/arm64/boot/dts/qcom/msm8992.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8992.dtsi @@ -135,6 +135,11 @@ pmu { interrupts = ; }; + psci { + compatible = "arm,psci-0.2"; + method = "hvc"; + }; + reserved-memory { #address-cells = <2>; #size-cells = <2>; From patchwork Thu Jun 25 18:21:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 198475 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5EC86C433E1 for ; Thu, 25 Jun 2020 18:22:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3E02F20781 for ; Thu, 25 Jun 2020 18:22:03 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="hfell9so" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406029AbgFYSWA (ORCPT ); Thu, 25 Jun 2020 14:22:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54816 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2406016AbgFYSV6 (ORCPT ); Thu, 25 Jun 2020 14:21:58 -0400 Received: from mail-ej1-x643.google.com (mail-ej1-x643.google.com [IPv6:2a00:1450:4864:20::643]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CECA5C08C5C1; Thu, 25 Jun 2020 11:21:57 -0700 (PDT) Received: by mail-ej1-x643.google.com with SMTP id dp18so6877513ejc.8; Thu, 25 Jun 2020 11:21:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mLiV2Xm7mdvGns4UhpSRX2p+DTCzoHG++quz1vD7S9o=; b=hfell9so75NLCpQ7OaQ8axRWNskfksS76RnSZ6UT3Os35cwfb2u00XXZiHvRsTvvzx FfQ1RE1esSnskPPXS93zOwvG/SYegp5a6YC2zdqhUUCFDtxFXWkp0XULduZv9rktD+6r 87fltf8rD6dcdiHtNUDMhCOjP9N25vBFwXAQDdX+uK4FOvXFcwrmliMZEPk2kHqrMPzb NoYAydSIBCkdzyMUdlrqHfku59CQEWq/zS/VkDlYkxmxbXCzhgh802jfvysSfew5jlCV wUBQ+BzeflpG9uOsE2JypCTzCpyy5nWRXrR4hEUBtA1HSlO2pACTDCrPIHA9OvsQk2oy Da/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mLiV2Xm7mdvGns4UhpSRX2p+DTCzoHG++quz1vD7S9o=; b=LKexEf3WwkBu/7SNCExFLuZYIkmnT27vtis/HipzanldgCYZqCfRy3KSnkPxS1/iq6 pr5Vuhqd7KynPk/6nPD1YGrw0xjSaiGBhMb3EA7xloK5u+qzHkN4dVG7B3GclU8ixTjs c6UmFiW4xfG0iY79dDDvCRz32OebIWw/SAoHiGPYnAJzcBfA/vcEaibrCKz07UiJX6aH rv096/W1LPCQA/JXmBiSfVHR+Blwo5Bv6AIOeJPzU3yYXgvW6bxANpo8TdK21OgLAXEU PBbEzBctmc9xkoQYlYWlXLVd/eSCVAjgqtGfzyKxVRQOBHH7uZgqFt6e8gtXxFE/OrNT zn2g== X-Gm-Message-State: AOAM531X3M3nqPQJ1hOgPTeOWCPEsezQgdUptG1qhwxjdz90k/YfXn7Q wXzjAdFoHmhGMXCn2Rh+MYs= X-Google-Smtp-Source: ABdhPJzAB1GNqTS1/EVlmpouqMRO2C8H5aosbEb+Mt5JfMaXq9ZP23qk4a6aV8JMNTF9CwAaiNejUQ== X-Received: by 2002:a17:906:8381:: with SMTP id p1mr9062791ejx.280.1593109316578; Thu, 25 Jun 2020 11:21:56 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id lm22sm1523448ejb.109.2020.06.25.11.21.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 11:21:56 -0700 (PDT) From: Konrad Dybcio To: skrzynka@konradybcio.pl Cc: Konrad Dybcio , Andy Gross , Bjorn Andersson , Rob Herring , Kees Cook , Anton Vorontsov , Colin Cross , Tony Luck , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 13/13] arm64: dts: qcom: Add Microsoft Lumia 950 (Talkman) device tree Date: Thu, 25 Jun 2020 20:21:17 +0200 Message-Id: <20200625182118.131476-14-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200625182118.131476-1-konradybcio@gmail.com> References: <20200625182118.131476-1-konradybcio@gmail.com> MIME-Version: 1.0 Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org Add device tree support for the Microsoft Lumia 950 smartphone. It is based on msm8992 and supports booting Linux via a custom EDK2 port. Currently it supports: * Screen console via EFIFB * Booting via EFI_STUB * SDHCI * I2C * PSCI core bringup Please note that there is an implementation of EL2 startup on this board, but it requires the user to resign from PSCI and use spin-table instead. This revision sticks with PSCI. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/Makefile | 1 + .../dts/qcom/msm8992-msft-lumia-talkman.dts | 39 +++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 arch/arm64/boot/dts/qcom/msm8992-msft-lumia-talkman.dts diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index 344cdeb68b16..77256eef9520 100644 --- a/arch/arm64/boot/dts/qcom/Makefile +++ b/arch/arm64/boot/dts/qcom/Makefile @@ -9,6 +9,7 @@ dtb-$(CONFIG_ARCH_QCOM) += msm8916-longcheer-l8150.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-a3u-eur.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8916-samsung-a5u-eur.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8992-bullhead-rev-101.dtb +dtb-$(CONFIG_ARCH_QCOM) += msm8992-msft-lumia-talkman.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8992-xiaomi-libra.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8994-angler-rev-101.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8996-mtp.dtb diff --git a/arch/arm64/boot/dts/qcom/msm8992-msft-lumia-talkman.dts b/arch/arm64/boot/dts/qcom/msm8992-msft-lumia-talkman.dts new file mode 100644 index 000000000000..3cc01f02219d --- /dev/null +++ b/arch/arm64/boot/dts/qcom/msm8992-msft-lumia-talkman.dts @@ -0,0 +1,39 @@ +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2020, Konrad Dybcio + */ + +/dts-v1/; + +#include "msm8992.dtsi" +#include "pm8994.dtsi" +#include "pmi8994.dtsi" +#include +#include + +/ { + model = "Microsoft Lumia 950"; + compatible = "microsoft,talkman", "qcom,msm8992"; + + /* Most Lumia 950 users use GRUB to load their kernels, + * hence there is no need for msm-id and friends. + */ + + /* This enables graphical output via bootloader-enabled display. + * acpi=no is required due to WP platforms having ACPI support, but + * only for Windows-based OSes. + */ + chosen { + bootargs = "earlycon=efifb console=efifb acpi=no"; + + #address-cells = <2>; + #size-cells = <2>; + ranges; + }; +}; + +&sdhc_1 { + status = "okay"; + + mmc-hs200-1_8v; +};