From patchwork Thu Jun 25 18:12:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 194554 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 77157C433E1 for ; Thu, 25 Jun 2020 18:14:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4E0C6207FC for ; Thu, 25 Jun 2020 18:14:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="AF6KOhNd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407014AbgFYSNO (ORCPT ); Thu, 25 Jun 2020 14:13:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53404 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405949AbgFYSNM (ORCPT ); Thu, 25 Jun 2020 14:13:12 -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 0E9B3C08C5C1; Thu, 25 Jun 2020 11:13:12 -0700 (PDT) Received: by mail-ed1-x542.google.com with SMTP id d15so4921097edm.10; Thu, 25 Jun 2020 11:13:11 -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=AF6KOhNd8+Z498lcTZkzkHuRc8HYGLg+ra4HJY8xScZGERcE3yEo9z477NmntN/HXO EZpNii7Mz0AhODAF5OufTL/YX5ArQz0Wk7yAcDKDz8Z/5e7qyIx6an382mTpJTKvD1L6 Tm7vp7IA5az1Z5R8cjYyHDYsFjbY11Hug0yAAd5Xwp1mIwT47X0L4A6sxHvJ48dgrKbP /iUjBjD4dCjV9UwUxKbR2LyxOSUIdlNl2fl5OS/a6yuf/MedtlM9FouTxxWCkyRZJS// 8o+ssx4GyvfHlHZ8E6QgDt00t2D40rtcEyMFv5bdAk7Qol8XN1wnBt7zVxxgB3tvJAOZ Az2Q== 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=By1awWqk4ihs0WxwCRl+13vmGBrhsL8JELvg53/GsTr2L8X+MjhEPCYUAp223NjQkU xJUN/xPi+XAeiQFYK3IU6ZhRnpEB+Dk5B2sHR2iT8x1lQf9SoWOiimU4FR64Elby/wJt /NZlqHuoDFvh0n+NU4v5Ka/i5o3zeJ9iVNW6X96/ZYDtlWjmd0lSNywy8FZafzO7Gp0k 91vjTbX2pw6q2SZM2gEe1BVpLp1+LbSA1MFSGY0uZjED8WGHCqgva7GrTKkEOo+KwuqC ubMmzv6VcKm/lOmVLWhxGCjWIoRfbI5c4pHRBM5tO5wfR3QdFR2tcK0BoDXGv29pXu0g 0BnQ== X-Gm-Message-State: AOAM532R89wz9TkZeoOuxWs1hiofS94ZntfzH7yULNxS7CwyqHGOurRx 6+9hZmwws1u95lYuZNVzbpg= X-Google-Smtp-Source: ABdhPJxliXIU8SFDcw276rmMUQPABFANCc7oYCRao+mRQ9u8Exq4XVExljsDoF/TPVLb3qzwHOVisA== X-Received: by 2002:aa7:c341:: with SMTP id j1mr3855343edr.197.1593108789491; Thu, 25 Jun 2020 11:13:09 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id p4sm19511112edj.64.2020.06.25.11.13.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 11:13:09 -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 v2 01/13] arm64: dts: qcom: msm8992: Modernize the DTS style Date: Thu, 25 Jun 2020 20:12:49 +0200 Message-Id: <20200625181303.129874-2-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200625181303.129874-1-konradybcio@gmail.com> References: <20200625181303.129874-1-konradybcio@gmail.com> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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:12:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 194560 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 736FCC433E1 for ; Thu, 25 Jun 2020 18:13:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4AD0C2081A for ; Thu, 25 Jun 2020 18:13:17 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kgPRy86R" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407018AbgFYSNP (ORCPT ); Thu, 25 Jun 2020 14:13:15 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53408 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2406015AbgFYSNN (ORCPT ); Thu, 25 Jun 2020 14:13:13 -0400 Received: from mail-ej1-x644.google.com (mail-ej1-x644.google.com [IPv6:2a00:1450:4864:20::644]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 61AD1C08C5DB; Thu, 25 Jun 2020 11:13:13 -0700 (PDT) Received: by mail-ej1-x644.google.com with SMTP id rk21so6879723ejb.2; Thu, 25 Jun 2020 11:13:13 -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=kgPRy86RCjK61P4JzPLhTuqMYAvNraZVLKP9tulRjVRduZf4MVUIK44FoyDWK5AN9W YV6rGvqWVCa54W06UOkIFe4I6EDB4OzEXbk5D4/X9wkSA+BFgvmnJM1WSFiOh+qRXnY0 Ag5jExA0eHugUoGee6cecz76WvIUKzeFvn/wNaaD9aHRdQHYiT0dlwvos2CuCSQ6HUL/ sYW0WvWtsEbCpk8ZJ5VW78jUSNet/mhjH/EXd/D6UdF4mB4bfIyRTjY1Zhqcem8V6Ix0 SBX0vmZAyq6OaxD2zc5CmhLJmSn16+EcVDfpvT82XCMz2luOX19POnLemzTi1/fT8ZHa fS/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=+puFNw9Af4Mq8TedQJihgmoj5SF8nSnYlnfkgvsEedk=; b=jN46w9bSVMY5RmIuOkl8FfMKwg22kI7nKja3o6p6tLZC7numcjTIO20Qw5SwarK8S4 GdkIYvcVlEeXHIj+puZ5l15j5FII1zvHPw2yHejlRfVxSUd24zfSswcLBnnvnMqjrYtF D1TwK3X/DBGi/xNjQNiTyPYaTit8lZyUzIpB/x8QIKVB2+bHfhOXMBxk4Ui0f60Nxmxo tLoYwzYaei0MCB1neF/xCZh7EQWTCJtz/I06fNPxdOjw4444HeCN3RMTJkRF+pCEajvx UOVFf6NymjNKdV1copE+sElQ+zTDTDjtcCOzeKUjLeBZ25rd9Dyf1wZLlArSCgbPjuUl Ju6g== X-Gm-Message-State: AOAM532Bo3yrvOe+AzkVHvZjeR0sd0FkM7aUlD7rRfSwV1uasY/jf3Gh Xa9wmHygpYib3kZ5CTKMlww= X-Google-Smtp-Source: ABdhPJxViezGSDGGke+gHlt8fABhYW3e4W/dtt5RdAruP1Pc+E/AZUuQ9/bu6TP3GaLIGKtoQQnntQ== X-Received: by 2002:a17:906:2b88:: with SMTP id m8mr32248780ejg.509.1593108792100; Thu, 25 Jun 2020 11:13:12 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id p4sm19511112edj.64.2020.06.25.11.13.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 11:13:11 -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 v2 02/13] arm64: dts: qcom: msm8992: Fix SDHCI1 Date: Thu, 25 Jun 2020 20:12:50 +0200 Message-Id: <20200625181303.129874-3-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200625181303.129874-1-konradybcio@gmail.com> References: <20200625181303.129874-1-konradybcio@gmail.com> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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:12:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 194555 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 50648C433DF for ; Thu, 25 Jun 2020 18:14:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 302742084D for ; Thu, 25 Jun 2020 18:14:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="V/mLaYMT" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407098AbgFYSOG (ORCPT ); Thu, 25 Jun 2020 14:14:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2407040AbgFYSNY (ORCPT ); Thu, 25 Jun 2020 14:13:24 -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 86074C08C5C1; Thu, 25 Jun 2020 11:13:23 -0700 (PDT) Received: by mail-ej1-x643.google.com with SMTP id o18so2413727eje.7; Thu, 25 Jun 2020 11:13:23 -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=V/mLaYMTezEBhloz/36vaqNT4BtHW0iURhA8ZD4UhZgW3lCGpujjBDWvZuPYZM0lZ0 7Mp2Z9Db09kNgTKJkJzY1Kw/Ybo9yds9aIVO+dDTOyh4hx7tg+p2HJB3T/0Ytl8b6MMc X/zarUY/zREbG2ZHEvhXRvEFOSQWJgpIHXZJaTejzoxHyRaImysaF9tVNTt67wvZ+mvF t40J3ugMWpX01f00sA2xH+SvQen5VwCl+rAGb5E7OC+ZEvo640tIg7Ms8jkLC8DrSvv/ Q2KUPqu9wKY/8z8wRUZ8GodAn0TfYsq65LRcEGIViOldQtnSHZWVSxEb4Mgzdexx3fF5 CMMA== 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=lVNY85lDMm0zehXzXbSLCAoabuqI/p/guOjayiWYSm+/sni8wd29gps1EY9MRSza9y OXZf1P5/HTdmnQ3i5nLwTqwkxNdCpX9xrey7EoPAVz5W5xjagwgab2CNVQl/xPlg+Frw 6N3JeOSQNslWSSWQ0Twvc4LGqURnR9FNbViVsPXlpXqPJRXNH4PpTuyYnBE5RUE/jczD DshjSYQ3QtKJqNHMBMiT5y6F9FMJ/mNO+gmBOVlWK6Zj4844uW06VLJcGjG/vcXY5xh1 oH2ANCt3/OwQ8fZ84kIv5gabtHbKbNdlGt4QS3sJfUWPsQ0fu08ECR5LDTl33PGLxzDQ 5wOw== X-Gm-Message-State: AOAM532fcR5CHpdzAdgHzTYrfX04WZAhyunmeYAvhIHpzMZoO703tj5H F0xX9Id2YP92m5r3eHGhTeQ= X-Google-Smtp-Source: ABdhPJyYQ8ZdnlTDp3QUbmx/VqWy+7+hkkQ7ybwWRlml8WI9phNKm1zLYlw/HzjVSdj1P0NFbs4QcA== X-Received: by 2002:a17:906:2bd1:: with SMTP id n17mr29786253ejg.147.1593108802275; Thu, 25 Jun 2020 11:13:22 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id p4sm19511112edj.64.2020.06.25.11.13.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 11:13:21 -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 v2 06/13] arm64: dts: msm8992: Add a SCM node Date: Thu, 25 Jun 2020 20:12:54 +0200 Message-Id: <20200625181303.129874-7-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200625181303.129874-1-konradybcio@gmail.com> References: <20200625181303.129874-1-konradybcio@gmail.com> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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:12:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 194559 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 92776C433DF for ; Thu, 25 Jun 2020 18:13:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6D1C52081A for ; Thu, 25 Jun 2020 18:13:28 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Dj73FoZV" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407053AbgFYSN1 (ORCPT ); Thu, 25 Jun 2020 14:13:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53452 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2407048AbgFYSN0 (ORCPT ); Thu, 25 Jun 2020 14:13:26 -0400 Received: from mail-ed1-x543.google.com (mail-ed1-x543.google.com [IPv6:2a00:1450:4864:20::543]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1CA10C08C5C1; Thu, 25 Jun 2020 11:13:26 -0700 (PDT) Received: by mail-ed1-x543.google.com with SMTP id b15so4932878edy.7; Thu, 25 Jun 2020 11:13: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=Yupj3iS3btyA2wZn0fmMTSkqzEVTX0a/axIV1WItg/k=; b=Dj73FoZVKxdm1g69pVvz98txhJShOUZ+RgO3PE8PmnfXFN1db4+hA0yIu5qjkOo68k tljiL1MdmsGNW71Bx9ryFPvz9aPBXGsAmn9MK0PYT+dQArwmXOPa/DnRLO3cn3dznmkq lpk8HxP2W9Nyg6qgvrJR9h7GPBWza5Xn+6FJtg+T+MUdaZdIlt5F6RuhVsez5rN5Ljya gMLBlMMSD5LCh9+WriwRcrxwbIj5qBMCkUvW5JLx16wwR4IRMi4XclH6yk0shG0cFA82 UyH+Wx/skzLpleB6Fj4Aj7Kpzv5y5RVlgbNdwExg9QcVzPogzS+sEMzrUG9WLEePL1vq /twQ== 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=Yupj3iS3btyA2wZn0fmMTSkqzEVTX0a/axIV1WItg/k=; b=W7KxqceJUm1MJaM8cnXgag4nMsrZFUmzjp3T/GCtj3QRW8lE9ljVO6qJFApn5qtuAB r6xgYVWme/is2X44lPEx65ZIkQbwkfzfkP6o8gYXMYeuT2j+DjfSzGjd2bvpxS8pMNDa G2F6OVQZ6TrO0YGV+7uURANlj8o1JWfHepWz7LumFA52KEcLgpA9Ap6MW0cZqHbEYa5w DjHTPiWtMH8LLaebLo36wYZFu9+v2S0QkDCnNjNdbQ0choEphcCpaiWefbOGNVDMVtlv sRe+NgAJ34coiWRXE4khDLuJuqxE66ce0nckOLpYg4QiFxt6vgNTacSaJpK8mMd2/1dt dXiA== X-Gm-Message-State: AOAM532fsUeE3yHIv4f79ZkyCHrVbbxHfamCQMjD6VlaR0ekLI9N+p3Z 6Xorl4pP2T355PSEUnodXdM= X-Google-Smtp-Source: ABdhPJxYXDfFaN1fDqyjyqU9RIfTFOKukKEWb++irF4nI8dvShJy1z6Eac0gO4gpUoXHvDNFSPntyQ== X-Received: by 2002:a50:cd53:: with SMTP id d19mr14489420edj.300.1593108804924; Thu, 25 Jun 2020 11:13:24 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id p4sm19511112edj.64.2020.06.25.11.13.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 11:13: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 v2 07/13] arm64: dts: qcom: msm8994: Add SPMI PMIC arbiter device Date: Thu, 25 Jun 2020 20:12:55 +0200 Message-Id: <20200625181303.129874-8-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200625181303.129874-1-konradybcio@gmail.com> References: <20200625181303.129874-1-konradybcio@gmail.com> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add SPMI PMIC arbiter device to communicate with PMICs attached to SPMI bus. Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/msm8992.dtsi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/msm8992.dtsi b/arch/arm64/boot/dts/qcom/msm8992.dtsi index aee33ed61858..acce7be22e50 100644 --- a/arch/arm64/boot/dts/qcom/msm8992.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8992.dtsi @@ -290,6 +290,22 @@ restart@fc4ab000 { reg = <0xfc4ab000 0x4>; }; + spmi_bus: spmi@fc4c0000 { + compatible = "qcom,spmi-pmic-arb"; + reg = <0xfc4cf000 0x1000>, + <0xfc4cb000 0x1000>, + <0xfc4ca000 0x1000>; + reg-names = "core", "intr", "cnfg"; + interrupt-names = "periph_irq"; + interrupts = ; + qcom,ee = <0>; + qcom,channel = <0>; + #address-cells = <2>; + #size-cells = <0>; + interrupt-controller; + #interrupt-cells = <4>; + }; + sfpb_mutex_regs: syscon@fd484000 { #address-cells = <1>; #size-cells = <1>; From patchwork Thu Jun 25 18:12:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 194556 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 91D1CC433E1 for ; Thu, 25 Jun 2020 18:13:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6D7682081A for ; Thu, 25 Jun 2020 18:13:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="O4sr0o7i" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2436513AbgFYSN6 (ORCPT ); Thu, 25 Jun 2020 14:13:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2407069AbgFYSNc (ORCPT ); Thu, 25 Jun 2020 14:13:32 -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 857F0C08C5C1; Thu, 25 Jun 2020 11:13:31 -0700 (PDT) Received: by mail-ej1-x643.google.com with SMTP id l12so6828540ejn.10; Thu, 25 Jun 2020 11:13: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=/mdCv9AcSwvn1xJCdZahbAIWOnw7ZszwaJLHBjtLMCw=; b=O4sr0o7iKJjER1cg5Z9cjEYGPFXfor0Na5/b3Tci+fdZy+s83omN4hujU99hlxYtXx Ct1Z+BUQjk4wzvnLjUek6AuvoZEYVcfTmTYkSAFce68BVEERGSZh2QB9vCOM0kZAucoK ylpfBBt/XKzt3nyZUJG9JOsj3dhMlFpJ58717ds82VEpvQH2964MmDBOSUxZiGDC45qr wGAf3bk7AsxHPfFaEWk4o+5wsGD9K2E0RAzHKcadZnqaSJVEN5l4CKYjwQ5R+OTXOdef KI4ShmBSudc21XABGFk7j0GaGhQxCGLpDsd01kjvAx950vp+3ps4+zfZikW15o1h3mEe fO3g== 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=/mdCv9AcSwvn1xJCdZahbAIWOnw7ZszwaJLHBjtLMCw=; b=hp1c2s+QteLa4RiWKaaCF2LA+rlKk4b1d0yEIVpJdK2nwDqzE7tm5wx0JaerQN0VpS bmgVinPdmuFRYHhbgxHQGL+40FMGwPBCLCrMK0SUqobsep+jAivgkbL4uishJDy6D8Jr 1RXPV0rb00WSFL27XheuMweP5JWPdSy/8XzQevD5Tt2a/xqlJ84OuIc4ss/rwQ2NwKIJ rpezhrxU2N5vo/6xTEgz7unLudo5YddnLPbdD634tuKMqVpquAsWAUPIz6snN6Hw9IcU 23KVE31VP962UTWLkFf7nJMl92zPWGjRLJC34YgxxCbtFc5Tb1xWKYXMXdXZ4oud24l4 x+Cg== X-Gm-Message-State: AOAM533sdmdM9UBV9NUUx3/g8AWwLVqLPJAIsrjov3JtXM2+udKa9zRp B60LJza+hDDLkmtmZsVbYOA= X-Google-Smtp-Source: ABdhPJzGhZC4PJgtvWmcTt9l6HMu8biB2dpppct5bxPGSolWyS2E/qfhD0lgDe3WTxfVtHRTRecy5g== X-Received: by 2002:a17:906:cc0e:: with SMTP id ml14mr16933281ejb.432.1593108810205; Thu, 25 Jun 2020 11:13:30 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id p4sm19511112edj.64.2020.06.25.11.13.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 11:13: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 v2 09/13] arm64: dts: msm8992: Add PMU node Date: Thu, 25 Jun 2020 20:12:57 +0200 Message-Id: <20200625181303.129874-10-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200625181303.129874-1-konradybcio@gmail.com> References: <20200625181303.129874-1-konradybcio@gmail.com> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Add the PMU so we can get proper perf event support on this SoC. 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 e8b801813f14..c4c9a108ae1e 100644 --- a/arch/arm64/boot/dts/qcom/msm8992.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8992.dtsi @@ -130,6 +130,11 @@ memory { reg = <0 0 0 0>; }; + pmu { + compatible = "arm,cortex-a53-pmu"; + interrupts = ; + }; + reserved-memory { #address-cells = <2>; #size-cells = <2>; From patchwork Thu Jun 25 18:12:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 194558 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 81512C433E1 for ; Thu, 25 Jun 2020 18:13:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5E4922082E for ; Thu, 25 Jun 2020 18:13:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="szKnzf4J" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2436491AbgFYSNg (ORCPT ); Thu, 25 Jun 2020 14:13:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53478 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2436484AbgFYSNe (ORCPT ); Thu, 25 Jun 2020 14:13:34 -0400 Received: from mail-ej1-x641.google.com (mail-ej1-x641.google.com [IPv6:2a00:1450:4864:20::641]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0D4AAC08C5C1; Thu, 25 Jun 2020 11:13:34 -0700 (PDT) Received: by mail-ej1-x641.google.com with SMTP id n24so6885646ejd.0; Thu, 25 Jun 2020 11:13:33 -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=szKnzf4JeyEFCuQIM8rZDsezQZib8hlkuLWZJoB6g6wHJAeaeyqjyNoX968tR1kZaT 6CkUkXc1piY7K/aglUyWLWGk19Ev3L03zfUiY5Nok7MwnOfJcTa3V5unPMP73lJza8z5 45WBwjLF9qqt6R7Usw1KoRgqrzRMjzTsQY4u75mPZ0fB/Sb6Z3Aa+fZSI4PgEFGqhCoh PMj+VcKFUMFIoLpb3Oa7FB85rJi6u+8qssoZpIcD45N7KmeHdwSiuPdTrXCj9gbhK4pp jGTjIDcw/hI6v6+gYTiBcv7VJxFTB3GvuxIM5f2mpP+P89oDLT00bG/SFO7GXlArjuWI F8TQ== 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=EB8xuzxUfZmxBkk95P+OOKP4D/zoHPZDS7FM26cKaTxklbzDzw40gI8mDaabKge4Pl bhyYWP37ksPQkyMCF2AhKrzypzWlPXBkpR3G0lhgyIE1u3+6uXrZ/QXW5cjKsPiL9QU+ XmWxf8N1oTwXAWKo+J20M2r3n+lfm1y2jCIq/XFawxjJwWoZLIpmwBMPs53MDmj7vl9O iVt5Ep8KvVgX/iztG6pV8xnmdAfuxY60CYm/XLphZimxWOHnmfzVAvqaRh3pLnYqnvIF FFyeqgAVl28vHY5UlM336teQv2HxB5ZYZK/eiECpnN69hg4DNaH0kaoTvwyNFvzWAPsZ kpfA== X-Gm-Message-State: AOAM533bOZrYslSfk+n6InuCb1CcgdMaZztQ5Ps09XNNCkRP1/iZRcYz Vodn76rnj6sHLp0twAuiT0U= X-Google-Smtp-Source: ABdhPJzBpOBUOequNmBUOCVS2xIwj41rONRx7icQxe8vKRBqDr5gXKoOqQfbXVBb8qQBWcNlk6rgOg== X-Received: by 2002:a17:907:20ee:: with SMTP id rh14mr30986932ejb.395.1593108812827; Thu, 25 Jun 2020 11:13:32 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id p4sm19511112edj.64.2020.06.25.11.13.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 11:13:32 -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 v2 10/13] arm64: dts: msm8992: Add PSCI support. Date: Thu, 25 Jun 2020 20:12:58 +0200 Message-Id: <20200625181303.129874-11-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200625181303.129874-1-konradybcio@gmail.com> References: <20200625181303.129874-1-konradybcio@gmail.com> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@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:13:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Konrad Dybcio X-Patchwork-Id: 194557 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 286F0C433DF for ; Thu, 25 Jun 2020 18:13:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 02D672081A for ; Thu, 25 Jun 2020 18:13:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="fh8PWGb9" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406022AbgFYSNl (ORCPT ); Thu, 25 Jun 2020 14:13:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53494 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2436484AbgFYSNj (ORCPT ); Thu, 25 Jun 2020 14:13:39 -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 6EF8EC08C5C1; Thu, 25 Jun 2020 11:13:39 -0700 (PDT) Received: by mail-ed1-x544.google.com with SMTP id d15so4922155edm.10; Thu, 25 Jun 2020 11:13: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=dvDLOKRG4O2InrW0PN0HnWa5B+zIHa5l8tfp3eSwRmw=; b=fh8PWGb9v330D2YylTgIJ6FJw9nwjL8aiQe33JZSzfbmfv98KjwGaXsEr9gGV9acJl cJNraRIg+9e/B4VbPDP8zpyOBgReNozLoL9Mhpz30GhkR4A4//2toeLCORCmzypZ4X0h LWO31ZIGi2kkJnTc4lUJOiffqI659H2YOWi3Ir9GwJssA1nK0J3z9I7R0ntySaaLRHay 00beKySftDwUGn3Bai3cKohZnApgn7+igagb/sX6/9Jn5wL/VOMOmP+MX6E7ccmLIlZy XKK2V396PYC0cyl8E920YYWj7ZMrPoXA62Im7uQHj38ikY9stEIp7HU6UyJNqDPNuYfQ hpeQ== 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=dvDLOKRG4O2InrW0PN0HnWa5B+zIHa5l8tfp3eSwRmw=; b=SdZDnYAQOnHOMjtUGMMm/5Q8Nqh7A5pPW6SlcdV68dbYITaIdcbaGYoL5fJR5dErwG O9daI76MndAoZBlMDItCj9ICbpUJmlU37MmbUh92e+Feg7SJpI8kjM7p9z7vxKqnARGh cDE0Q1dZMcJzqXXFFI4gm5Aqwo+O2hFKcWVji5eezGuhbCV+yevkV1x6BlvHTCbn5niv KOo8A1oJBb7idvMUW6ZVvw90OKG8QQIvL2nRA2WDw6mm/suKfhukhPhlQD4iA4OVR6P5 OhvBorVBCJCCl1deZuyOsJByL1nZxYCHwEnuyEJw4VxJIU7ccFFYZw2P2d82xDB5uikr cpBw== X-Gm-Message-State: AOAM531QWfeIuyyUOToSksA7an5kcKsxD1KKcqpAcIRdzL7+NPSRqx7C YzgrTVZ0V6fs7hQMt5mTkAI= X-Google-Smtp-Source: ABdhPJxWvnzxrYa16Q2InoqDtaS09YVezymW6CfVM9zraIjGDxUmgzAqGaHUDjaVlVvUYOgrkGSDEA== X-Received: by 2002:aa7:c3d6:: with SMTP id l22mr4084072edr.148.1593108818104; Thu, 25 Jun 2020 11:13:38 -0700 (PDT) Received: from localhost.localdomain (abag196.neoplus.adsl.tpnet.pl. [83.6.170.196]) by smtp.googlemail.com with ESMTPSA id p4sm19511112edj.64.2020.06.25.11.13.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 11:13: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 v2 12/13] arm64: dts: qcom: Add Xiaomi Libra (Mi 4C) device tree Date: Thu, 25 Jun 2020 20:13:00 +0200 Message-Id: <20200625181303.129874-13-konradybcio@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200625181303.129874-1-konradybcio@gmail.com> References: <20200625181303.129874-1-konradybcio@gmail.com> MIME-Version: 1.0 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org This commit adds support for the Xiaomi Libra (Mi 4C) smartphone. It's based on the Qualcomm msm8992 SoC. It currently supports: * Screen console from bootloader * SDHCI * Regulator configuration * Serial console * I2C Signed-off-by: Konrad Dybcio --- arch/arm64/boot/dts/qcom/Makefile | 1 + .../boot/dts/qcom/msm8992-xiaomi-libra.dts | 364 ++++++++++++++++++ 2 files changed, 365 insertions(+) create mode 100644 arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts diff --git a/arch/arm64/boot/dts/qcom/Makefile b/arch/arm64/boot/dts/qcom/Makefile index 0f2c33d611df..344cdeb68b16 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-xiaomi-libra.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8994-angler-rev-101.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8996-mtp.dtb dtb-$(CONFIG_ARCH_QCOM) += msm8998-asus-novago-tp370ql.dtb diff --git a/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts b/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts new file mode 100644 index 000000000000..ac9b2f325fc1 --- /dev/null +++ b/arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts @@ -0,0 +1,364 @@ +// 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 = "Xiaomi Mi 4C"; + compatible = "xiaomi,libra", "qcom,msm8992"; + /* required for bootloader to select correct board */ + qcom,msm-id = <251 0 252 0>; + qcom,pmic-id = <65545 65546 0 0>; + qcom,board-id = <12 0>; + + /* This enables graphical output via bootloader-enabled display */ + chosen { + bootargs = "earlycon=tty0 console=tty0"; + + #address-cells = <2>; + #size-cells = <2>; + ranges; + + framebuffer0: framebuffer@3404000 { + status= "okay"; + compatible = "simple-framebuffer"; + reg = <0 0x3404000 0 (1080 * 1920 * 3)>; + width = <1080>; + height = <1920>; + stride = <(1080 * 3)>; + format = "r8g8b8"; + }; + }; + + gpio_keys { + compatible = "gpio-keys"; + input-name = "gpio-keys"; + #address-cells = <1>; + #size-cells = <0>; + autorepeat; + + button@0 { + label = "Volume Up"; + gpios = <&pm8994_gpios 3 GPIO_ACTIVE_LOW>; + linux,input-type = <1>; + linux,code = ; + wakeup-source; + debounce-interval = <15>; + }; + }; + + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + /* This is for getting crash logs using Android downstream kernels */ + ramoops@dfc00000 { + compatible = "ramoops"; + reg = <0x0 0xdfc00000 0x0 0x40000>; + console-size = <0x10000>; + record-size = <0x10000>; + ftrace-size = <0x10000>; + pmsg-size = <0x20000>; + }; + + continuous_splash: framebuffer@3401000{ + reg = <0x0 0x3401000 0x0 0x2200000>; + no-map; + }; + + dfps_data_mem: dfps_data_mem@3400000 { + reg = <0x0 0x3400000 0x0 0x1000>; + no-map; + }; + + peripheral_region: peripheral_region@7400000 { + reg = <0x0 0x7400000 0x0 0x1c00000>; + no-map; + }; + + modem_region: modem_region@9000000 { + reg = <0x0 0x9000000 0x0 0x5a00000>; + no-map; + }; + + tzapp: modem_region@ea00000 { + reg = <0x0 0xea00000 0x0 0x1900000>; + no-map; + }; + }; +}; + +&blsp_i2c2 { + status = "okay"; + + /* Atmel or Synaptics touchscreen */ +}; + +&blsp_i2c5 { + status = "okay"; + + /* Silabs si4705 FM transmitter */ +}; + +&blsp_i2c6 { + status = "okay"; + + /* NCI NFC, + * TI USB320 Type-C controller, + * Pericom 30216a USB (de)mux switch + */ +}; + +&blsp_i2c7 { + status = "okay"; + + /* cm36686 proximity and ambient light sensor */ +}; + +&blsp_i2c13 { + status = "okay"; + + /* ST lsm6db0 gyro/accelerometer */ +}; + +&blsp2_uart2 { + status = "okay"; +}; + +&rpm_requests { + pm8994-regulators { + compatible = "qcom,rpm-pm8994-regulators"; + + vdd_l1-supply = <&pm8994_s7>; + vdd_l2_26_28-supply = <&pm8994_s3>; + vdd_l3_11-supply = <&pm8994_s3>; + vdd_l4_27_31-supply = <&pm8994_s3>; + vdd_l5_7-supply = <&pm8994_s3>; + vdd_l6_12_32-supply = <&pm8994_s5>; + vdd_l8_16_30-supply = <&vreg_vph_pwr>; + vdd_l9_10_18_22-supply = <&vreg_vph_pwr>; + vdd_l13_19_23_24-supply = <&vreg_vph_pwr>; + vdd_l14_15-supply = <&pm8994_s5>; + vdd_l17_29-supply = <&vreg_vph_pwr>; + vdd_l20_21-supply = <&vreg_vph_pwr>; + vdd_l25-supply = <&pm8994_s5>; + vdd_lvs1_2 = <&pm8994_s4>; + + pm8994_s1: s1 { + /* unused */ + status = "disabled"; + }; + + pm8994_s2: s2 { + /* unused */ + status = "disabled"; + }; + + pm8994_s3: s3 { + regulator-min-microvolt = <1300000>; + regulator-max-microvolt = <1300000>; + }; + + pm8994_s4: s4 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-allow-set-load; + regulator-always-on; + regulator-system-load = <325000>; + }; + + pm8994_s5: s5 { + regulator-min-microvolt = <2150000>; + regulator-max-microvolt = <2150000>; + }; + + pm8994_s7: s7 { + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + }; + + pm8994_l1: l1 { + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + }; + + pm8994_l2: l2 { + regulator-min-microvolt = <1250000>; + regulator-max-microvolt = <1250000>; + }; + + pm8994_l3: l3 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + }; + + pm8994_l4: l4 { + regulator-min-microvolt = <1225000>; + regulator-max-microvolt = <1225000>; + }; + + pm8994_l5: l5 { + /* unused */ + status = "disabled"; + }; + + pm8994_l6: l6 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pm8994_l7: l7 { + /* unused */ + status = "disabled"; + }; + + pm8994_l8: l8 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pm8994_l9: l9 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pm8994_l10: l10 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pm8994_l11: l11 { + regulator-min-microvolt = <1200000>; + regulator-max-microvolt = <1200000>; + }; + + pm8994_l12: l12 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pm8994_l13: l13 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <2950000>; + }; + + pm8994_l14: l14 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pm8994_l15: l15 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pm8994_l16: l16 { + regulator-min-microvolt = <2700000>; + regulator-max-microvolt = <2700000>; + }; + + pm8994_l17: l17 { + regulator-min-microvolt = <2700000>; + regulator-max-microvolt = <2700000>; + }; + + pm8994_l18: l18 { + regulator-min-microvolt = <2850000>; + regulator-max-microvolt = <2850000>; + regulator-always-on; + }; + + pm8994_l19: l19 { + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + }; + + pm8994_l20: l20 { + regulator-min-microvolt = <2950000>; + regulator-max-microvolt = <2950000>; + regulator-always-on; + regulator-boot-on; + regulator-allow-set-load; + regulator-system-load = <570000>; + }; + + pm8994_l21: l21 { + regulator-min-microvolt = <2950000>; + regulator-max-microvolt = <2950000>; + regulator-always-on; + }; + + pm8994_l22: l22 { + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + }; + + pm8994_l23: l23 { + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + }; + + pm8994_l24: l24 { + regulator-min-microvolt = <3075000>; + regulator-max-microvolt = <3150000>; + }; + + pm8994_l25: l25 { + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + }; + + pm8994_l26: l26 { + regulator-min-microvolt = <987500>; + regulator-max-microvolt = <987500>; + + }; + + pm8994_l27: l27 { + regulator-min-microvolt = <1050000>; + regulator-max-microvolt = <1050000>; + }; + + pm8994_l28: l28 { + regulator-min-microvolt = <1000000>; + regulator-max-microvolt = <1000000>; + }; + + pm8994_l29: l29 { + regulator-min-microvolt = <2800000>; + regulator-max-microvolt = <2800000>; + }; + + pm8994_l30: l30 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + + pm8994_l31: l31 { + regulator-min-microvolt = <1262500>; + regulator-max-microvolt = <1262500>; + }; + + pm8994_l32: l32 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + }; + }; +}; + +&sdhc_1 { + status = "okay"; + + mmc-hs400-1_8v; + vmmc-supply = <&pm8994_l20>; + vqmmc-supply = <&pm8994_s4>; +};