From patchwork Tue Feb 13 10:58:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rong Zhang X-Patchwork-Id: 200368 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp458752dyb; Tue, 13 Feb 2024 03:02:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IE2b9ZB3JJevIDGxddxVpS9b1DUUkYRRu9JugTkectOrKDe5edt2Ly13HoCpsbSyq7phgkp X-Received: by 2002:a05:6a21:3401:b0:19e:9959:35e with SMTP id yn1-20020a056a21340100b0019e9959035emr7559704pzb.12.1707822178899; Tue, 13 Feb 2024 03:02:58 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1707822178; cv=pass; d=google.com; s=arc-20160816; b=iPtdPLV1plmIuUrGQeEH4xz0tnYBlM/4VCzVA5NT6Np5kvF9djcCbUz8hS29lWse0K oHbYKznriszPRi1U4acrXyaGeC/jUl4jmOaGg2cDgd/617rzOM+0z+RCaT03B2NFCvaI oL7xpmx90y4o5t2uOK8CnNv2Xp0jA9x3wZcl3GhL/JvE+iSnjFXcZka5SanedqmYguQi tMIuU1vgQKVDvkvSt2CUJeVAIhZUmEZcL3yEWoY92K+PKprKuEZLPiMDZX2If8YtlZum L2/bo5XLibwTH1iLw7tAdpSppptbn81DQtRfg1SPd7Nj7hqXOGtzbGZUlbFdYbqgzz3q WwOw== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature:delivered-to; bh=ft+fadpzafcTR18vf2K7pUNzQk4Ri3rihQeat15SmN0=; fh=OmiLqpruaIzStIqio2gtb3ZTGzxyOQdRU6B7eu8Xdto=; b=GY6S+MSnaUHDOpDYCJ1Wc5Qb+WaLBohM0EPJLiv68Mjel9WyagWWwXedW9fsGS8uDn xFelMlayjsq4GEc/tA6ExmKY1NxQqx9o4y6dQrMGAvn3Uet8MuAXhVbw8MST3IMmGp3d WMvy2B08lhHWbNcG7XQWYhjSFU0lbPgxsiXxzZsAuczNFV+8PA6RNU1m+gdB+Pm2iVED 0QzlsxAN5cRFIact4OIrnt8n8fTo6p5L4DWRZdMGoBXDgxWmB/EtJ3EPoJErrWjGqMxQ 4vXUbLXY033J9QTi4y/vR8Arl3rOBiHnwG1yJlADomLoV3EgVQ3rWUurkjiWMF1+UOK/ mCvA==; dara=google.com ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@rong.moe header.s=zmail header.b=yeGc9MOQ; arc=pass (i=2 spf=pass spfdomain=rong.moe dkim=pass dkdomain=rong.moe); spf=pass (google.com: domain of linux-kernel+bounces-63390-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63390-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=3; AJvYcCVfpX3y7lPFew0yZKwRd8rkVp8v0+rdAyYR8OIHg6i3SQws6RgEfmgVtBnhtzFUvQ19AI3eU4Cr8xHxqBFKh1doc9vFWw== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id d128-20020a633686000000b005d8e28279bcsi1894168pga.540.2024.02.13.03.02.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 03:02:58 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63390-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@rong.moe header.s=zmail header.b=yeGc9MOQ; arc=pass (i=2 spf=pass spfdomain=rong.moe dkim=pass dkdomain=rong.moe); spf=pass (google.com: domain of linux-kernel+bounces-63390-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63390-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id A206A284141 for ; Tue, 13 Feb 2024 11:02:58 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 6F8F1381D0; Tue, 13 Feb 2024 11:02:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=rong.moe header.i=i@rong.moe header.b="yeGc9MOQ" Received: from sender4-op-o15.zoho.com (sender4-op-o15.zoho.com [136.143.188.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 52CEB364BF; Tue, 13 Feb 2024 11:02:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.15 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707822125; cv=pass; b=TQ0xSh5uucx9YoQKc7nGpb9MQfhJDkPFxfw5u8NRm1hX6NwU0LgjY3cOrebg589xiJ/WJbKZzzziDoUDoJmPnhRdeM5qziactR+OJd/h9bsTVqYPRjhoDw5c47JL6ar54i8RDYxnHW3iSsO6TKoNwuCxfanJRLVsu1QyYz7jmsw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707822125; c=relaxed/simple; bh=q8mANGYdRQROipkF4QinNT0ErBlok38DlBLZyYfa3cQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GgWFK72XyuEwKYp0dZSEOYr1IClsWvDODcev9my1wXjL8E/UAQh4je8L/W7lqvqGKI9jXdcFpKxrnj7SXQLRZvLUM28RsX/wOzeVeD+zNOiYqPNbOGSfVp9el6/YL96u5fNyZ2Icj+9Iya7wqMoOUMUKPXygOJqtmrOP284IkL8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rong.moe; spf=pass smtp.mailfrom=rong.moe; dkim=pass (1024-bit key) header.d=rong.moe header.i=i@rong.moe header.b=yeGc9MOQ; arc=pass smtp.client-ip=136.143.188.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rong.moe Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rong.moe Delivered-To: i@rong.moe ARC-Seal: i=1; a=rsa-sha256; t=1707822116; cv=none; d=zohomail.com; s=zohoarc; b=XYmNjQWs+vER5ZGWV2VPJExQTWurXudx/YwAU1qQxe+jpHo9Qpvjvu4EJ/fAJ2ahjzLmCD3weiHD1v1hzz6jC/iEr1DwLsmIv+et7wVQoIOdxyMheX2LTm1T5gmp6UmlQyj7cwOVBx+XWEwdp33HYMxfaepcNVbKx5PAhuaUDtU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1707822116; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=ft+fadpzafcTR18vf2K7pUNzQk4Ri3rihQeat15SmN0=; b=hbn/rTRQ01j8WhMEcV8yVe5+iZe/dZc0bLP6cG9AXOpvf2dVYQX/4sMHF+h0wuTO2VxGUYV9EJs9xotzgzwa/j8myxFALjYVx/QUUklDWr+rAWgq2HKLgR98FEo0s6R3LYDHVX+Si1dDbpOiouZ5U3IuAE451D9YoGTExGKlmE4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=rong.moe; spf=pass smtp.mailfrom=i@rong.moe; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1707822116; s=zmail; d=rong.moe; i=i@rong.moe; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=ft+fadpzafcTR18vf2K7pUNzQk4Ri3rihQeat15SmN0=; b=yeGc9MOQLBsro4R5BqPBEa9zExrZyF/tVYXJHzNL3C/y5/QhZVh/CuzfM7lvGDI5 7Qn8ycyw9/p1IaKbBnuzdU119WK5jH94THQ9prndgiEJh1o2JPnZyY4RgX8QHydv1dt AsY5gSDtJ+P6S+YXCV0bL8pzzawKw9aLoofXZtFo= Received: from localhost.localdomain (163.142.242.182 [163.142.242.182]) by mx.zohomail.com with SMTPS id 1707822115587118.38457054799937; Tue, 13 Feb 2024 03:01:55 -0800 (PST) From: Rong Zhang To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Rong Zhang , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Icenowy Zheng Subject: [PATCH v3 1/4] ARM: dts: qcom: msm8974: Split out common part of samsung-klte Date: Tue, 13 Feb 2024 18:58:36 +0800 Message-ID: <20240213110137.122737-2-i@rong.moe> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213110137.122737-1-i@rong.moe> References: <20240213110137.122737-1-i@rong.moe> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ZohoMailClient: External X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790781349033212794 X-GMAIL-MSGID: 1790781349033212794 Samsung Galaxy S5 has many variants. Variants that support LTE use klte* as their codename. Currently, the only supported one is the one without any suffix, namely, klte. It is known that other klte* variants have only minor differences compared to klte and can mostly work with the klte DTB. Split the common part into a common DTSI so that it can be imported in the DTS of klte and other klte* variants. Signed-off-by: Rong Zhang Reviewed-by: Krzysztof Kozlowski --- ... qcom-msm8974pro-samsung-klte-common.dtsi} | 7 +- .../dts/qcom/qcom-msm8974pro-samsung-klte.dts | 833 +----------------- 2 files changed, 17 insertions(+), 823 deletions(-) copy arch/arm/boot/dts/qcom/{qcom-msm8974pro-samsung-klte.dts => qcom-msm8974pro-samsung-klte-common.dtsi} (98%) rewrite arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts (99%) diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte-common.dtsi similarity index 98% copy from arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts copy to arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte-common.dtsi index b93539e2b87e..11e35b34ebd6 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte-common.dtsi @@ -6,8 +6,6 @@ #include / { - model = "Samsung Galaxy S5"; - compatible = "samsung,klte", "qcom,msm8974pro", "qcom,msm8974"; chassis-type = "handset"; aliases { @@ -77,12 +75,10 @@ touchkey@20 { }; }; - i2c-gpio-led { + i2c_led_gpio: i2c-gpio-led { compatible = "i2c-gpio"; #address-cells = <1>; #size-cells = <0>; - scl-gpios = <&tlmm 121 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; - sda-gpios = <&tlmm 120 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; pinctrl-names = "default"; pinctrl-0 = <&i2c_led_gpioex_pins>; @@ -770,7 +766,6 @@ i2c_touchkey_pins: i2c-touchkey-state { }; i2c_led_gpioex_pins: i2c-led-gpioex-state { - pins = "gpio120", "gpio121"; function = "gpio"; bias-pull-down; }; diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts dissimilarity index 99% index b93539e2b87e..954665f3a9dd 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte.dts @@ -1,817 +1,16 @@ -// SPDX-License-Identifier: GPL-2.0 -#include "qcom-msm8974pro.dtsi" -#include "pma8084.dtsi" -#include -#include -#include - -/ { - model = "Samsung Galaxy S5"; - compatible = "samsung,klte", "qcom,msm8974pro", "qcom,msm8974"; - chassis-type = "handset"; - - aliases { - serial0 = &blsp1_uart1; - mmc0 = &sdhc_1; /* SDC1 eMMC slot */ - mmc1 = &sdhc_3; /* SDC2 SD card slot */ - }; - - chosen { - stdout-path = "serial0:115200n8"; - }; - - gpio-keys { - compatible = "gpio-keys"; - - pinctrl-names = "default"; - pinctrl-0 = <&gpio_keys_pin_a>; - - key-volume-down { - label = "volume_down"; - gpios = <&pma8084_gpios 2 GPIO_ACTIVE_LOW>; - linux,input-type = <1>; - linux,code = ; - debounce-interval = <15>; - }; - - key-home { - label = "home_key"; - gpios = <&pma8084_gpios 3 GPIO_ACTIVE_LOW>; - linux,input-type = <1>; - linux,code = ; - wakeup-source; - debounce-interval = <15>; - }; - - key-volume-up { - label = "volume_up"; - gpios = <&pma8084_gpios 5 GPIO_ACTIVE_LOW>; - linux,input-type = <1>; - linux,code = ; - debounce-interval = <15>; - }; - }; - - i2c-gpio-touchkey { - compatible = "i2c-gpio"; - #address-cells = <1>; - #size-cells = <0>; - sda-gpios = <&tlmm 95 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; - scl-gpios = <&tlmm 96 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; - pinctrl-names = "default"; - pinctrl-0 = <&i2c_touchkey_pins>; - - touchkey@20 { - compatible = "cypress,tm2-touchkey"; - reg = <0x20>; - - interrupt-parent = <&pma8084_gpios>; - interrupts = <6 IRQ_TYPE_EDGE_FALLING>; - pinctrl-names = "default"; - pinctrl-0 = <&touchkey_pin>; - - vcc-supply = <&max77826_ldo15>; - vdd-supply = <&pma8084_l19>; - - linux,keycodes = ; - }; - }; - - i2c-gpio-led { - compatible = "i2c-gpio"; - #address-cells = <1>; - #size-cells = <0>; - scl-gpios = <&tlmm 121 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; - sda-gpios = <&tlmm 120 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; - pinctrl-names = "default"; - pinctrl-0 = <&i2c_led_gpioex_pins>; - - i2c-gpio,delay-us = <2>; - - gpio_expander: gpio@20 { - compatible = "nxp,pcal6416"; - reg = <0x20>; - - gpio-controller; - #gpio-cells = <2>; - - vcc-supply = <&pma8084_s4>; - - pinctrl-names = "default"; - pinctrl-0 = <&gpioex_pin>; - - reset-gpios = <&tlmm 145 GPIO_ACTIVE_LOW>; - }; - - led-controller@30 { - compatible = "panasonic,an30259a"; - reg = <0x30>; - - #address-cells = <1>; - #size-cells = <0>; - - led@1 { - reg = <1>; - function = LED_FUNCTION_STATUS; - color = ; - }; - - led@2 { - reg = <2>; - function = LED_FUNCTION_STATUS; - color = ; - }; - - led@3 { - reg = <3>; - function = LED_FUNCTION_STATUS; - color = ; - }; - }; - }; - - vreg_wlan: wlan-regulator { - compatible = "regulator-fixed"; - - regulator-name = "wl-reg"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - - gpio = <&gpio_expander 8 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; - - vreg_panel: panel-regulator { - compatible = "regulator-fixed"; - - pinctrl-names = "default"; - pinctrl-0 = <&panel_en_pin>; - - regulator-name = "panel-vddr-reg"; - regulator-min-microvolt = <1500000>; - regulator-max-microvolt = <1500000>; - - gpio = <&pma8084_gpios 14 GPIO_ACTIVE_HIGH>; - enable-active-high; - }; - - vreg_vph_pwr: vreg-vph-pwr { - compatible = "regulator-fixed"; - regulator-name = "vph-pwr"; - - regulator-min-microvolt = <3600000>; - regulator-max-microvolt = <3600000>; - - regulator-always-on; - }; -}; - -&blsp1_i2c2 { - status = "okay"; - - touchscreen@20 { - compatible = "syna,rmi4-i2c"; - reg = <0x20>; - - interrupt-parent = <&pma8084_gpios>; - interrupts = <8 IRQ_TYPE_EDGE_FALLING>; - - vdd-supply = <&max77826_ldo13>; - vio-supply = <&pma8084_lvs2>; - - pinctrl-names = "default"; - pinctrl-0 = <&touch_pin>; - - syna,startup-delay-ms = <100>; - - #address-cells = <1>; - #size-cells = <0>; - - rmi4-f01@1 { - reg = <0x1>; - syna,nosleep-mode = <1>; - }; - - rmi4-f12@12 { - reg = <0x12>; - syna,sensor-type = <1>; - }; - }; -}; - -&blsp1_i2c6 { - status = "okay"; - - pmic@60 { - reg = <0x60>; - compatible = "maxim,max77826"; - - regulators { - max77826_ldo1: LDO1 { - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; - }; - - max77826_ldo2: LDO2 { - regulator-min-microvolt = <1000000>; - regulator-max-microvolt = <1000000>; - }; - - max77826_ldo3: LDO3 { - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; - }; - - max77826_ldo4: LDO4 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - max77826_ldo5: LDO5 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - max77826_ldo6: LDO6 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - }; - - max77826_ldo7: LDO7 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - max77826_ldo8: LDO8 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - }; - - max77826_ldo9: LDO9 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - max77826_ldo10: LDO10 { - regulator-min-microvolt = <2800000>; - regulator-max-microvolt = <2950000>; - }; - - max77826_ldo11: LDO11 { - regulator-min-microvolt = <2700000>; - regulator-max-microvolt = <2950000>; - }; - - max77826_ldo12: LDO12 { - regulator-min-microvolt = <2500000>; - regulator-max-microvolt = <3300000>; - }; - - max77826_ldo13: LDO13 { - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - }; - - max77826_ldo14: LDO14 { - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - }; - - max77826_ldo15: LDO15 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - max77826_buck: BUCK { - regulator-min-microvolt = <1225000>; - regulator-max-microvolt = <1225000>; - }; - - max77826_buckboost: BUCKBOOST { - regulator-min-microvolt = <3400000>; - regulator-max-microvolt = <3400000>; - }; - }; - }; -}; - -&blsp1_uart2 { - status = "okay"; -}; - -&blsp2_i2c6 { - status = "okay"; - - fuelgauge@36 { - compatible = "maxim,max17048"; - reg = <0x36>; - - maxim,double-soc; - maxim,rcomp = /bits/ 8 <0x56>; - - interrupt-parent = <&pma8084_gpios>; - interrupts = <21 IRQ_TYPE_LEVEL_LOW>; - - pinctrl-names = "default"; - pinctrl-0 = <&fuelgauge_pin>; - }; -}; - -&blsp2_uart2 { - status = "okay"; - - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&blsp2_uart2_pins_active>; - pinctrl-1 = <&blsp2_uart2_pins_sleep>; - - bluetooth { - compatible = "brcm,bcm43540-bt"; - max-speed = <3000000>; - pinctrl-names = "default"; - pinctrl-0 = <&bt_pins>; - device-wakeup-gpios = <&tlmm 91 GPIO_ACTIVE_HIGH>; - shutdown-gpios = <&gpio_expander 9 GPIO_ACTIVE_HIGH>; - interrupt-parent = <&tlmm>; - interrupts = <75 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "host-wakeup"; - }; -}; - -&gpu { - status = "okay"; -}; - -&mdss { - status = "okay"; -}; - -&mdss_dsi0 { - status = "okay"; - - vdda-supply = <&pma8084_l2>; - vdd-supply = <&pma8084_l22>; - vddio-supply = <&pma8084_l12>; - - panel: panel@0 { - reg = <0>; - compatible = "samsung,s6e3fa2"; - - pinctrl-names = "default"; - pinctrl-0 = <&panel_te_pin &panel_rst_pin>; - - iovdd-supply = <&pma8084_lvs4>; - vddr-supply = <&vreg_panel>; - - reset-gpios = <&pma8084_gpios 17 GPIO_ACTIVE_LOW>; - - port { - panel_in: endpoint { - remote-endpoint = <&mdss_dsi0_out>; - }; - }; - }; -}; - -&mdss_dsi0_out { - remote-endpoint = <&panel_in>; - data-lanes = <0 1 2 3>; -}; - -&mdss_dsi0_phy { - status = "okay"; - - vddio-supply = <&pma8084_l12>; -}; - -&pma8084_gpios { - gpio_keys_pin_a: gpio-keys-active-state { - pins = "gpio2", "gpio3", "gpio5"; - function = "normal"; - - bias-pull-up; - power-source = ; - }; - - touchkey_pin: touchkey-int-state { - pins = "gpio6"; - function = "normal"; - bias-disable; - input-enable; - power-source = ; - }; - - touch_pin: touchscreen-int-state { - pins = "gpio8"; - function = "normal"; - bias-disable; - input-enable; - power-source = ; - }; - - panel_en_pin: panel-en-state { - pins = "gpio14"; - function = "normal"; - bias-pull-up; - power-source = ; - qcom,drive-strength = ; - }; - - wlan_sleep_clk_pin: wlan-sleep-clk-state { - pins = "gpio16"; - function = "func2"; - - output-high; - power-source = ; - qcom,drive-strength = ; - }; - - panel_rst_pin: panel-rst-state { - pins = "gpio17"; - function = "normal"; - bias-disable; - power-source = ; - qcom,drive-strength = ; - }; - - fuelgauge_pin: fuelgauge-int-state { - pins = "gpio21"; - function = "normal"; - bias-disable; - input-enable; - power-source = ; - }; -}; - -&remoteproc_adsp { - status = "okay"; - cx-supply = <&pma8084_s2>; -}; - -&remoteproc_mss { - status = "okay"; - cx-supply = <&pma8084_s2>; - mss-supply = <&pma8084_s6>; - mx-supply = <&pma8084_s1>; - pll-supply = <&pma8084_l12>; -}; - -&rpm_requests { - regulators-0 { - compatible = "qcom,rpm-pma8084-regulators"; - - pma8084_s1: s1 { - regulator-min-microvolt = <675000>; - regulator-max-microvolt = <1050000>; - regulator-always-on; - }; - - pma8084_s2: s2 { - regulator-min-microvolt = <500000>; - regulator-max-microvolt = <1050000>; - }; - - pma8084_s3: s3 { - regulator-min-microvolt = <1300000>; - regulator-max-microvolt = <1300000>; - }; - - pma8084_s4: s4 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - pma8084_s5: s5 { - regulator-min-microvolt = <2150000>; - regulator-max-microvolt = <2150000>; - }; - - pma8084_s6: s6 { - regulator-min-microvolt = <1050000>; - regulator-max-microvolt = <1050000>; - }; - - pma8084_l1: l1 { - regulator-min-microvolt = <1225000>; - regulator-max-microvolt = <1225000>; - }; - - pma8084_l2: l2 { - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; - }; - - pma8084_l3: l3 { - regulator-min-microvolt = <1050000>; - regulator-max-microvolt = <1200000>; - }; - - pma8084_l4: l4 { - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1225000>; - }; - - pma8084_l5: l5 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - pma8084_l6: l6 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - pma8084_l7: l7 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - pma8084_l8: l8 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - pma8084_l9: l9 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <2950000>; - }; - - pma8084_l10: l10 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <2950000>; - }; - - pma8084_l11: l11 { - regulator-min-microvolt = <1300000>; - regulator-max-microvolt = <1300000>; - }; - - pma8084_l12: l12 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - }; - - pma8084_l13: l13 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <2950000>; - }; - - pma8084_l14: l14 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - pma8084_l15: l15 { - regulator-min-microvolt = <2050000>; - regulator-max-microvolt = <2050000>; - }; - - pma8084_l16: l16 { - regulator-min-microvolt = <2700000>; - regulator-max-microvolt = <2700000>; - }; - - pma8084_l17: l17 { - regulator-min-microvolt = <2850000>; - regulator-max-microvolt = <2850000>; - }; - - pma8084_l18: l18 { - regulator-min-microvolt = <2850000>; - regulator-max-microvolt = <2850000>; - }; - - pma8084_l19: l19 { - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - }; - - pma8084_l20: l20 { - regulator-min-microvolt = <2950000>; - regulator-max-microvolt = <2950000>; - regulator-system-load = <200000>; - regulator-allow-set-load; - }; - - pma8084_l21: l21 { - regulator-min-microvolt = <2950000>; - regulator-max-microvolt = <2950000>; - regulator-system-load = <200000>; - regulator-allow-set-load; - }; - - pma8084_l22: l22 { - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3300000>; - }; - - pma8084_l23: l23 { - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3000000>; - }; - - pma8084_l24: l24 { - regulator-min-microvolt = <3075000>; - regulator-max-microvolt = <3075000>; - }; - - pma8084_l25: l25 { - regulator-min-microvolt = <2100000>; - regulator-max-microvolt = <2100000>; - }; - - pma8084_l26: l26 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <2050000>; - }; - - pma8084_l27: l27 { - regulator-min-microvolt = <1000000>; - regulator-max-microvolt = <1225000>; - }; - - pma8084_lvs1: lvs1 {}; - pma8084_lvs2: lvs2 {}; - pma8084_lvs3: lvs3 {}; - pma8084_lvs4: lvs4 {}; - - pma8084_5vs1: 5vs1 {}; - }; -}; - -&sdhc_1 { - status = "okay"; - - vmmc-supply = <&pma8084_l20>; - vqmmc-supply = <&pma8084_s4>; - - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&sdc1_on>; - pinctrl-1 = <&sdc1_off>; -}; - -&sdhc_2 { - status = "okay"; - max-frequency = <100000000>; - vmmc-supply = <&vreg_wlan>; - vqmmc-supply = <&pma8084_s4>; - non-removable; - - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&sdc2_on>; - pinctrl-1 = <&sdc2_off>; - - wifi@1 { - reg = <1>; - compatible = "brcm,bcm4329-fmac"; - - interrupt-parent = <&tlmm>; - interrupts = <92 IRQ_TYPE_LEVEL_HIGH>; - interrupt-names = "host-wake"; - - pinctrl-names = "default"; - pinctrl-0 = <&wlan_sleep_clk_pin &wifi_pin>; - }; -}; - -&sdhc_3 { - status = "okay"; - max-frequency = <100000000>; - vmmc-supply = <&pma8084_l21>; - vqmmc-supply = <&pma8084_l13>; - - /* - * cd-gpio is intentionally disabled. If enabled, an SD card - * present during boot is not initialized correctly. Without - * cd-gpios the driver resorts to polling, so hotplug works. - */ - pinctrl-names = "default"; - pinctrl-0 = <&sdc3_on /* &sdhc3_cd_pin */>; - /* cd-gpios = <&tlmm 62 GPIO_ACTIVE_LOW>; */ -}; - -&tlmm { - /* This seems suspicious, but somebody with this device should look into it. */ - blsp2_uart2_pins_active: blsp2-uart2-pins-active-state { - pins = "gpio45", "gpio46", "gpio47", "gpio48"; - function = "blsp_uart8"; - drive-strength = <8>; - bias-disable; - }; - - blsp2_uart2_pins_sleep: blsp2-uart2-pins-sleep-state { - pins = "gpio45", "gpio46", "gpio47", "gpio48"; - function = "gpio"; - drive-strength = <2>; - bias-pull-down; - }; - - bt_pins: bt-pins-state { - hostwake-pins { - pins = "gpio75"; - function = "gpio"; - drive-strength = <16>; - }; - - devwake-pins { - pins = "gpio91"; - function = "gpio"; - drive-strength = <2>; - }; - }; - - sdc1_on: sdhc1-on-state { - clk-pins { - pins = "sdc1_clk"; - drive-strength = <4>; - bias-disable; - }; - - cmd-data-pins { - pins = "sdc1_cmd", "sdc1_data"; - drive-strength = <4>; - bias-pull-up; - }; - }; - - sdc3_on: sdc3-on-state { - pins = "gpio35", "gpio36", "gpio37", "gpio38", "gpio39", "gpio40"; - function = "sdc3"; - drive-strength = <8>; - bias-disable; - }; - - sdhc3_cd_pin: sdc3-cd-on-state { - pins = "gpio62"; - function = "gpio"; - - drive-strength = <2>; - bias-disable; - }; - - sdc2_on: sdhc2-on-state { - clk-pins { - pins = "sdc2_clk"; - drive-strength = <6>; - bias-disable; - }; - - cmd-data-pins { - pins = "sdc2_cmd", "sdc2_data"; - drive-strength = <6>; - bias-pull-up; - }; - }; - - i2c_touchkey_pins: i2c-touchkey-state { - pins = "gpio95", "gpio96"; - function = "gpio"; - bias-pull-up; - }; - - i2c_led_gpioex_pins: i2c-led-gpioex-state { - pins = "gpio120", "gpio121"; - function = "gpio"; - bias-pull-down; - }; - - gpioex_pin: gpioex-state { - pins = "gpio145"; - function = "gpio"; - bias-pull-up; - drive-strength = <2>; - }; - - wifi_pin: wifi-state { - pins = "gpio92"; - function = "gpio"; - bias-pull-down; - }; - - panel_te_pin: panel-state { - pins = "gpio12"; - function = "mdp_vsync"; - drive-strength = <2>; - bias-disable; - }; -}; - -&usb { - status = "okay"; - - phys = <&usb_hs1_phy>; - phy-select = <&tcsr 0xb000 0>; - - hnp-disable; - srp-disable; - adp-disable; -}; - -&usb_hs1_phy { - status = "okay"; - - v1p8-supply = <&pma8084_l6>; - v3p3-supply = <&pma8084_l24>; - - qcom,init-seq = /bits/ 8 <0x1 0x64>; -}; +// SPDX-License-Identifier: GPL-2.0 +#include "qcom-msm8974pro-samsung-klte-common.dtsi" + +/ { + model = "Samsung Galaxy S5"; + compatible = "samsung,klte", "qcom,msm8974pro", "qcom,msm8974"; +}; + +&i2c_led_gpio { + scl-gpios = <&tlmm 121 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + sda-gpios = <&tlmm 120 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; +}; + +&i2c_led_gpioex_pins { + pins = "gpio120", "gpio121"; +}; From patchwork Tue Feb 13 10:58:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rong Zhang X-Patchwork-Id: 200369 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp458771dyb; Tue, 13 Feb 2024 03:03:01 -0800 (PST) X-Google-Smtp-Source: AGHT+IEpwUtyztLtrx1P4Lb6s2IAGe1hO3khaGA8dPOKFsJ2xWnzVucuwNFzqGY62Kg3sx5eLGqU X-Received: by 2002:a05:6512:20c7:b0:511:936d:59d6 with SMTP id u7-20020a05651220c700b00511936d59d6mr2521419lfr.26.1707822180933; Tue, 13 Feb 2024 03:03:00 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1707822180; cv=pass; d=google.com; s=arc-20160816; b=G+AqLfwiOlxY7Yx/PwsvU8Myupd8e50YSgSGjozvD/l9JItwH42Thby7G7+6J/RZzn GZAnjUTo0z7XKEBhCwBUUm1tA4MXL+YpT5oUw/vCz/pjvt3SNQBxvLM7yb7Mvjsggaba kz34pb1bJG+CX/5tmw715DTIu6QytiMgRr/ChEenaZy3bef2zKuqN7IREI55ZiF8LYGX 6TGGbX8Q2xqpj+FhC8qDBfnxMe3KdgDKRHc+hvZQy73iM+EPg7RbPo/4fFU7TACjXRVJ zjYhKARk6ekvu5Mn30qrKzaJ+Gv+I7ouY6WIbFBnyt6HSh4ME+iQjZ/x/+Ob9B0/CmPR wdow== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature:delivered-to; bh=pauhXQflxiHTx3+ep5HdmtF4d2AedYZI1LAzRZrEGCM=; fh=cFlTMj+cMhn+zhZXZSLtva3MSeD6K4A2uXQrR5nRUn8=; b=e2K2COKILIB2y7fMntR6zr3cGKEC1VptM1+ZMGmJViilmHx+7Ln8oJ0o2XYo6zHBrL KGFBpScsa8aNUJLWJRm9b/E6GJec0S//aoQlM38ivl64cQo+wfo1KKu7VgMKsmHWv4iN Mmi33rIJyGqzzdQ3oNsap7hDoc2jhZWnjMeFtlrBca78UhA/ss/tDa0ip9VM8a98OrMf E7v56fcuJRG0Dmnognh9PzDVneSfhb/TA+huuG+BiyxAgIbAAuyVKC3XTActrCIZXP/Y 9W3PistfOscSYrBZ1xJi4hyYgJ5eLv3uN7txM3AyzmS740Drvas39yYsFeY7O4nDEqXL HDqw==; dara=google.com ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@rong.moe header.s=zmail header.b="sLUY8/ud"; arc=pass (i=2 spf=pass spfdomain=rong.moe dkim=pass dkdomain=rong.moe); spf=pass (google.com: domain of linux-kernel+bounces-63391-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63391-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=3; AJvYcCVJwN0U89ydo5FkHQttiH/ZjYnZrp/tYr5F8D2nlwntK8BKFkcOhhrKibgOlBF1LwDG5mBdZqhJQtiGuHFMebaA5HJh8A== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id j4-20020a170906830400b00a3ce2cdbab1si957276ejx.305.2024.02.13.03.03.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 03:03:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63391-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@rong.moe header.s=zmail header.b="sLUY8/ud"; arc=pass (i=2 spf=pass spfdomain=rong.moe dkim=pass dkdomain=rong.moe); spf=pass (google.com: domain of linux-kernel+bounces-63391-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63391-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id EA8911F271E5 for ; Tue, 13 Feb 2024 11:02:51 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D9C80381B4; Tue, 13 Feb 2024 11:02:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=rong.moe header.i=i@rong.moe header.b="sLUY8/ud" Received: from sender4-op-o15.zoho.com (sender4-op-o15.zoho.com [136.143.188.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B009A36AFD; Tue, 13 Feb 2024 11:02:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.15 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707822128; cv=pass; b=JQ4PbzjCZ6LA2Sp6uRqe8rLenQsBnIp6lwik6rl5EC9nZXEJs3g91xFtq9bivPZoL2X0Pn5XkotgWpk3Lk24CmtJKNFRjIuxGuR5Z/5y9YbtI7IifLjxDUewKlkmpIKo4j/MAuQWCdWQHe6X3GSJ6VXzIk6YcKrzw43gXGfPvHw= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707822128; c=relaxed/simple; bh=8snw/S9bFuqeaPU/SR/M26e9RHX4wd3kkLrnrLkpZ/E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tQwjLUA4S9G+9Mogd6s97HR7IMwsMXJs0L77bkoKWQjZrGLSq7Z0Wp0xiK3nUiDdEIuNuX82cxh7xFRH5gsK6iHjxn+1ZyW1wygX7lRzzcceOf3CXXyfIeTJ4gduQ2KihKQXtnTmzJBh8RU2W95TZNwhpeLZsE7sfGKBYSVuzP8= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rong.moe; spf=pass smtp.mailfrom=rong.moe; dkim=pass (1024-bit key) header.d=rong.moe header.i=i@rong.moe header.b=sLUY8/ud; arc=pass smtp.client-ip=136.143.188.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rong.moe Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rong.moe Delivered-To: i@rong.moe ARC-Seal: i=1; a=rsa-sha256; t=1707822120; cv=none; d=zohomail.com; s=zohoarc; b=YZMpTHWMBBTIfEzXCAeNiiMxDTqoknzKi0U3h5MPF18l2j6E/8TVi7e2Bdv/Y42Cphg96JggwYGUXs1I7HFnMA9OnVxoS0++SsxNi4ej3MhKJwQkOdA73c3PL3ePTnaLPSaCN4SryA7hpx6+Wq5/eGqfaMFAmytRNEXyzOeeUJQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1707822120; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=pauhXQflxiHTx3+ep5HdmtF4d2AedYZI1LAzRZrEGCM=; b=D+MV36OxvD/QRrYuXEcdG3FaFamRXV26CrEIRdPYWvUi+IOfbKYqUaHnxib1ChDUE/x4EWoaLfYNRBv5O2LYqIP/1wB224JbSoQ05bDBqYAsFXula4jvsSwga18uGxRQdKofphOfEVPX3OjAPKnJNhiCfEzxIOw3ER/N6+eSEa8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=rong.moe; spf=pass smtp.mailfrom=i@rong.moe; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1707822120; s=zmail; d=rong.moe; i=i@rong.moe; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=pauhXQflxiHTx3+ep5HdmtF4d2AedYZI1LAzRZrEGCM=; b=sLUY8/udeY1f4P3pmePAoRWwsLnaP7z9+i444E0gcTEktohb9bl4iIZl2DOa1D0D 9nx6vmJjvHxzS9unL/6Pm3llpr6GzVtZdawVPt7SgZ9hTYqA76zo5//u2J0hesJLq9Q LK/d91moDdOOkfW/GNuncJEeHYIAxy3vncBt++/A= Received: from localhost.localdomain (163.142.242.182 [163.142.242.182]) by mx.zohomail.com with SMTPS id 1707822119295716.8504126918681; Tue, 13 Feb 2024 03:01:59 -0800 (PST) From: Rong Zhang To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Rong Zhang , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Icenowy Zheng Subject: [PATCH v3 2/4] ARM: dts: qcom: msm8974-klte-common: Pin WiFi board type Date: Tue, 13 Feb 2024 18:58:37 +0800 Message-ID: <20240213110137.122737-3-i@rong.moe> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213110137.122737-1-i@rong.moe> References: <20240213110137.122737-1-i@rong.moe> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ZohoMailClient: External X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790781351494787139 X-GMAIL-MSGID: 1790781351494787139 klte* variants have little difference in the WiFi part. Without "brcm,board-type", variant-specific NVRAM file will be probed (e.g., klte probes samsung,klte). Pin it to "samsung,klte" to allow klte* to load the same NVRAM file as klte. Signed-off-by: Rong Zhang Acked-by: Konrad Dybcio --- .../boot/dts/qcom/qcom-msm8974pro-samsung-klte-common.dtsi | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte-common.dtsi b/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte-common.dtsi index 11e35b34ebd6..b5443fd5b425 100644 --- a/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte-common.dtsi +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-klte-common.dtsi @@ -661,6 +661,12 @@ wifi@1 { reg = <1>; compatible = "brcm,bcm4329-fmac"; + /* + * Allow all klte* variants to load the same NVRAM file, + * as they have little difference in the WiFi part. + */ + brcm,board-type = "samsung,klte"; + interrupt-parent = <&tlmm>; interrupts = <92 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "host-wake"; From patchwork Tue Feb 13 10:58:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rong Zhang X-Patchwork-Id: 200370 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp458863dyb; Tue, 13 Feb 2024 03:03:12 -0800 (PST) X-Forwarded-Encrypted: i=4; AJvYcCUYLqCiioRH9FWCThna9JkCOpf8w/WXqInKGxF5NEJtUyueLpwGnQA0Bcs9Xtcd3hOCxT2wNd1t8yG3sBc1jOL8mF7BvQ== X-Google-Smtp-Source: AGHT+IGHc4LPyr9rRGwoh1BtJioz4w4aQiP0uOlTCFXj5y7xKDhsHQBg86yXJOexLHEG1s0tYtc1 X-Received: by 2002:a37:c444:0:b0:785:d303:677c with SMTP id h4-20020a37c444000000b00785d303677cmr5817320qkm.55.1707822192333; Tue, 13 Feb 2024 03:03:12 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1707822192; cv=pass; d=google.com; s=arc-20160816; b=RhGLLBCZ9MDLS1Gr15MxoPasoOyman72feGNKpY2faz4VrD/e9pR+y6Liom8u6WExn 2pyE6psc/R3bRHxADzYm0t3UWtmtTls5KyEHFvvVPQW9pEMDteDXPFjHcFDTFTy6c9Kk fQxlibep7xH0OBY4oAI7NSxoZeXdHe4RaABFrhZP+VLNa/F4pOD5jGiXpMgd6tCmLiOd A8ZXS44FgdqUkCeQdG6tsdRksj5WrZ+ME2VsyA4e5B9ifinRSsHKHHO483jFifc+1/jW Z36Dr7uIwhXxe/qYEMPJe0tRR7ZaKL9tRLffj9yW2o17YsbPs8V5zFoMB28AihsUCr+7 nDlA== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature:delivered-to; bh=mRFSyOG/P156sVZjTag+xT8d/0ChLv7uzEHsNaqh/xw=; fh=BBzZxF6gYyARujxK3AxfQ1tB16vn8srUL8J0YMnZLr8=; b=snyr+FSXHVfGpa4OjvFuIFKKbXxB7c476mtZE8ftF7wSJraT1fCpltYDb7iKmkXIuL 1rEe2YHf0ovPQ78PqLNlRhJjGrn6Xi7E7+NhbhaR78jXaHm8kBC+p9ZZMVWkSDXn2Kq5 XhD4MqUdhppO3hIpgCkm3C8fFZPySDUOHpHJ7hfrUqHWrijALf2vU7UKqvoMtEF42SMA bNv6AYeOKd4Hy4NypLg9q8N7QC+FeKQlE/1BTGT0ui8yUeHsb/c7S3UODiHCubPHOsYG G6fa3ThEGqYf7EilyelNu2oxYpnOsZb+w6flpsGAQGh2KPdNE+SYg+rqR4mtGpvQQGjw gWZw==; dara=google.com ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@rong.moe header.s=zmail header.b="CW6Mg/0I"; arc=pass (i=2 spf=pass spfdomain=rong.moe dkim=pass dkdomain=rong.moe); spf=pass (google.com: domain of linux-kernel+bounces-63392-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63392-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=3; AJvYcCV0DicHtjxIwsxzgcBDAqEItaYxqf6QM3llVGqw8LmVNnHBJPFeZ4Dbc95qlSqmEO+tMqJKx9kmDhko3ZZxsAHky5F9SQ== Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id vr9-20020a05620a55a900b0078715f3f611si2343819qkn.140.2024.02.13.03.03.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 03:03:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63392-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@rong.moe header.s=zmail header.b="CW6Mg/0I"; arc=pass (i=2 spf=pass spfdomain=rong.moe dkim=pass dkdomain=rong.moe); spf=pass (google.com: domain of linux-kernel+bounces-63392-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63392-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 24D911C20FDF for ; Tue, 13 Feb 2024 11:03:12 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id D1F4D38F91; Tue, 13 Feb 2024 11:02:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=rong.moe header.i=i@rong.moe header.b="CW6Mg/0I" Received: from sender4-op-o15.zoho.com (sender4-op-o15.zoho.com [136.143.188.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A1869374FC; Tue, 13 Feb 2024 11:02:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.15 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707822131; cv=pass; b=TA6cihc2N87wHNlRfOJLr8Q91SxVaUm55xrGnS8KBMLErFAbzCuKj4m53tQiZ4u5UzRyVGfbdKOswBhcHAOthYrl7aBkwrwz2bnL89wmbYjdNmflXiyUEzT4EcqrkPNenTNP+/AUOz8UKi8eyGsxDIh4AwT0MNQxpLKnSrmss6k= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707822131; c=relaxed/simple; bh=UPViyWZq7mqy4tdrjNLfKxnbaoTqYOR4V9N2hlor1Is=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eHEe7NaTpuhE6xZfyjRcg/+ybw/edx1RjlvlwRMgN0qCFaDuRTH4Pk4rhVRu/KrlTsUww0Fle3XFe73yZ5Sw60nUV6ZEDoREhYA0nfq/tndaF9rT4cJp3TlPEs9hGpSHo+AtFkCdawrtD97aOWHN7LG5BzF2X4LXhNhYPAsv7cs= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rong.moe; spf=pass smtp.mailfrom=rong.moe; dkim=pass (1024-bit key) header.d=rong.moe header.i=i@rong.moe header.b=CW6Mg/0I; arc=pass smtp.client-ip=136.143.188.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rong.moe Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rong.moe Delivered-To: i@rong.moe ARC-Seal: i=1; a=rsa-sha256; t=1707822124; cv=none; d=zohomail.com; s=zohoarc; b=JwUr1gWXasy7OM+ySswDQOQv9W8pr46Qa0xCJrsaa6nevkxsyi69tl5KjAZXOU8ARqRVdbe8XPNWeY8GaE6GpwNa8jAz6Td9YpOt0h5hB95xIas6H20GmYRKbW4cQM3ufQfDq5Iv8yoCc2WZce1eU9dAmdZ3zuHYz2yhfyzxGhk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1707822124; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=mRFSyOG/P156sVZjTag+xT8d/0ChLv7uzEHsNaqh/xw=; b=iOE8Ql9Xj0Y3YKDuJ091xiIXHwJFvMLbCYxbVDKD0lLhYuo0c6WEPwA/N1LIXu+5vMPMMY57p1BOky1KZac9zcpDmFRLkmbW5qNB7NfP1xtM23p3dxJf2Dh9MCQ/SvqoEV6myOiO/IAHwQGRhuYMfIsTUnXelanUyq9oYjnFDkE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=rong.moe; spf=pass smtp.mailfrom=i@rong.moe; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1707822124; s=zmail; d=rong.moe; i=i@rong.moe; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=mRFSyOG/P156sVZjTag+xT8d/0ChLv7uzEHsNaqh/xw=; b=CW6Mg/0IoHX6eqnkrgY8j4dxmheY83WAthpEczksTJn82qQnyd3k4JNm7lyAa3+8 FAJECj8FrUYS2vc8WX/xrZPRz5VyKTsmgOme1L2xnu1IMzKTcQk2Xe8OU923H/EZcCP 6Ng1+SN3gP6DfQkvVgov8K3qxB4UfRwIxoclc3ww= Received: from localhost.localdomain (163.142.242.182 [163.142.242.182]) by mx.zohomail.com with SMTPS id 1707822122858920.6100136629509; Tue, 13 Feb 2024 03:02:02 -0800 (PST) From: Rong Zhang To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Rong Zhang , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Icenowy Zheng Subject: [PATCH v3 3/4] dt-bindings: arm: qcom: Add Samsung Galaxy S5 China (kltechn) Date: Tue, 13 Feb 2024 18:58:38 +0800 Message-ID: <20240213110137.122737-4-i@rong.moe> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213110137.122737-1-i@rong.moe> References: <20240213110137.122737-1-i@rong.moe> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ZohoMailClient: External X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790781363356221456 X-GMAIL-MSGID: 1790781363356221456 Document Samsung Galaxy S5 China (kltechn) as a klte variant based on msm8974pro. Also including "samsung,klte" in the compatible chain as kltechn works fine with the klte DTB except for LEDs and WiFi missing. Signed-off-by: Rong Zhang Acked-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/arm/qcom.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml index 1a5fb889a444..4979ccae2b64 100644 --- a/Documentation/devicetree/bindings/arm/qcom.yaml +++ b/Documentation/devicetree/bindings/arm/qcom.yaml @@ -227,6 +227,13 @@ properties: - const: qcom,msm8974pro - const: qcom,msm8974 + - items: + - enum: + - samsung,kltechn + - const: samsung,klte + - const: qcom,msm8974pro + - const: qcom,msm8974 + - items: - const: qcom,msm8916-mtp - const: qcom,msm8916-mtp/1 From patchwork Tue Feb 13 10:58:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rong Zhang X-Patchwork-Id: 200380 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:bc8a:b0:106:860b:bbdd with SMTP id dn10csp466863dyb; Tue, 13 Feb 2024 03:18:59 -0800 (PST) X-Google-Smtp-Source: AGHT+IFMdnQoVDRvIJ8ZvOh5TDa2fVAVuNKKxzOMgW2cdAi1tPIJBY2mckFNfyxdMvBXHtVDxMYi X-Received: by 2002:a17:90a:51a3:b0:298:ae6f:3139 with SMTP id u32-20020a17090a51a300b00298ae6f3139mr937006pjh.12.1707823139283; Tue, 13 Feb 2024 03:18:59 -0800 (PST) ARC-Seal: i=3; a=rsa-sha256; t=1707823139; cv=pass; d=google.com; s=arc-20160816; b=d+E9zZ0nZ6pWNIcoOhL9T+CG087Ddv0joZ8yCplAuP9F1sISE6Y7z2pLTkVAww8cAB m1jC0jY+YNQBVADhEN/vNUNLWRLaZ6Hjfohex8J2/DQrATGyJYvb+Ho1/sHAJzLDTA6E RRD2CI//KKtSKCGjzXw1otRfJ+8YzJevpbJSaDBeFsgNDiSL1LaSaRzXxBEO6ocaNjGl 8L0QgR2Dv5f7ihIxpvQ53aMDMLIsZfpWvc5Yn8stYWcKserR9zK/+ulPOCrid614Bidz RRKFK6FVtQRG2F3s5fX360FpGGvjbXYJFJCqrKi4WlwqJExQzqm4IJrLfYfuoOnViEUb GauA== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature:delivered-to; bh=j651x5Hilte5Xbmo4xSk1+lCVyQJvHUohQWSnBdMyQw=; fh=Sjiv1od6UhGbeO0QHLkbBWwRcZArHBrx4YvjnzMqQZU=; b=KjruM7dr7iipae2Awgbq4ySwNAxCrDMLo81W7kIQxFBRJeIStRestjBrnuVUhwGCWr 28zy/6QUnDeM0zpIGVhSzpnCRPNtfVOnWwBoTj2I6kDJcIl5+/LUlmWFDiE5xsFPmMhy /39EtmmgwwKb+e3S3i4fBMeCt8R3DJpzZEEIZxmGNiBw1N1GSFUvM0dFE3Xlk/IVj38p kkreCJlcgrSZV5D9gLVpakJl1gkVi7r3aWQa5AFprCRMhfeCC+4lbrMgMP9CRvukcyHJ Bpl/1NC3/oKUjqAqZclK6ra2YUG91wPk4+bUn0DiPhzOOm9TwfwMqDNdVygsmyuplXEj YrXA==; dara=google.com ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@rong.moe header.s=zmail header.b=fa5EyQD3; arc=pass (i=2 spf=pass spfdomain=rong.moe dkim=pass dkdomain=rong.moe); spf=pass (google.com: domain of linux-kernel+bounces-63393-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63393-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=3; AJvYcCUpYL4TXAfLhs+JHWoFO5G/t5/dXDJwWITuchFHA9DROXj4lj0NAs0CabwqcEHcKUEoULiha/apfFcn+j1x++XIYH6DMw== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id m19-20020a637113000000b005ce030a6460si1844401pgc.71.2024.02.13.03.18.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Feb 2024 03:18:59 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-63393-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@rong.moe header.s=zmail header.b=fa5EyQD3; arc=pass (i=2 spf=pass spfdomain=rong.moe dkim=pass dkdomain=rong.moe); spf=pass (google.com: domain of linux-kernel+bounces-63393-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-63393-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 60261B22402 for ; Tue, 13 Feb 2024 11:03:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B33903A8EE; Tue, 13 Feb 2024 11:02:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=rong.moe header.i=i@rong.moe header.b="fa5EyQD3" Received: from sender4-op-o15.zoho.com (sender4-op-o15.zoho.com [136.143.188.15]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A6B5938DF5; Tue, 13 Feb 2024 11:02:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.15 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707822135; cv=pass; b=FPeFfK19y1CLXA+POfZpFSiqNeoCGjcNv8edTqWDFGnnSBJJgpfRMdGngDyBQdy+x5BmNuDlpBrXwcfyJNKgmiXNF0ioNKrwAhfavDKsPPVyMdq6KYFxoontCFTPKtxqzfZMTTuaPNLTm9+0UP1Jqw+OScmqBzDrKY1M50TW1hQ= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707822135; c=relaxed/simple; bh=ZZJDvmwgaVNUkd/QLeaQQXIy40n2tDqzdfn4OklKNVA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uWkqSrr8Q/nLiiRwBO7po4pGhxNHNJIaGUIyHChgVxdSD0UTfHSt/Az4ryKE2PGAe/y4eUI0fNjGbbivD1i6aOn5flHYCDUPipBBM6xKGD2GAOfpfrZg5baaU1Eiwt0UnM3konKJYlQj6Vnd/p9FxN8V2fgzi9wHcU1DsJz8u78= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rong.moe; spf=pass smtp.mailfrom=rong.moe; dkim=pass (1024-bit key) header.d=rong.moe header.i=i@rong.moe header.b=fa5EyQD3; arc=pass smtp.client-ip=136.143.188.15 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rong.moe Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rong.moe Delivered-To: i@rong.moe ARC-Seal: i=1; a=rsa-sha256; t=1707822129; cv=none; d=zohomail.com; s=zohoarc; b=d9HezmARuJAYGFSwJ1LTdYoq58QKthHAhTLkBJUXfgzvkgS+sQ19AgrGLNgubdhIQFVB+epcMX8Iz4w4NTj6szBFPYNS5LCJonn3DaF0rxI3WCYsDvinwURYYxdUxFHWHqNQ+xVHEwm0bWF1GYJr1vAoY1RUOkA/tXKAbAY7y5U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1707822129; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=j651x5Hilte5Xbmo4xSk1+lCVyQJvHUohQWSnBdMyQw=; b=g4Mtnz7meTtxytGrX+owcyM+GlPTo8tAatTZ9ydEtHIc8NWb6BNd4QnbiEEdFDyrkZo4qqtG7LPm/HDgn4fXetc5cX0VoPsCzCH0gtq4jveKQuk5OrK/csN+5iGGNI+26ZMdUADWoRVavwB4VNk2ImU6tsPZr5shIbAxGTAyRHg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=rong.moe; spf=pass smtp.mailfrom=i@rong.moe; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1707822129; s=zmail; d=rong.moe; i=i@rong.moe; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-ID:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Message-Id:Reply-To; bh=j651x5Hilte5Xbmo4xSk1+lCVyQJvHUohQWSnBdMyQw=; b=fa5EyQD3TQShmT/mjR+73kLJ1n6QjAdQ7jw85rRFHkeNOJ0pPs+JebFFtqAocqd9 t1Le7wL/er9mmXCG/+BqYHW7XTDtWX40gr3T+vHUfqf5+GbyBoKGoGxu4dWGJtRKhvb PYrbppfHeIjM9w8hAb3QQxqOWMdvLd5Q/5ohdSZ8= Received: from localhost.localdomain (163.142.242.182 [163.142.242.182]) by mx.zohomail.com with SMTPS id 1707822126636336.74326025946925; Tue, 13 Feb 2024 03:02:06 -0800 (PST) From: Rong Zhang To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley Cc: Rong Zhang , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Icenowy Zheng Subject: [PATCH v3 4/4] ARM: dts: qcom: msm8974: Add DTS for Samsung Galaxy S5 China (kltechn) Date: Tue, 13 Feb 2024 18:58:39 +0800 Message-ID: <20240213110137.122737-5-i@rong.moe> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240213110137.122737-1-i@rong.moe> References: <20240213110137.122737-1-i@rong.moe> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ZohoMailClient: External X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790782356119891603 X-GMAIL-MSGID: 1790782356119891603 The only difference between Samsung Galaxy S5 China (kltechn) and klte is the gpio pins of i2c_led_gpio. With pins corrected, the LEDs and WiFi are able to work properly. Signed-off-by: Rong Zhang Reviewed-by: Krzysztof Kozlowski --- arch/arm/boot/dts/qcom/Makefile | 1 + .../dts/qcom/qcom-msm8974pro-samsung-kltechn.dts | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-kltechn.dts diff --git a/arch/arm/boot/dts/qcom/Makefile b/arch/arm/boot/dts/qcom/Makefile index 9cc1e14e6cd0..5d7a34adf826 100644 --- a/arch/arm/boot/dts/qcom/Makefile +++ b/arch/arm/boot/dts/qcom/Makefile @@ -44,6 +44,7 @@ dtb-$(CONFIG_ARCH_QCOM) += \ qcom-msm8974pro-fairphone-fp2.dtb \ qcom-msm8974pro-oneplus-bacon.dtb \ qcom-msm8974pro-samsung-klte.dtb \ + qcom-msm8974pro-samsung-kltechn.dtb \ qcom-msm8974pro-sony-xperia-shinano-castor.dtb \ qcom-mdm9615-wp8548-mangoh-green.dtb \ qcom-sdx55-mtp.dtb \ diff --git a/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-kltechn.dts b/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-kltechn.dts new file mode 100644 index 000000000000..b902e31b16c2 --- /dev/null +++ b/arch/arm/boot/dts/qcom/qcom-msm8974pro-samsung-kltechn.dts @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0 +#include "qcom-msm8974pro-samsung-klte-common.dtsi" + +/ { + model = "Samsung Galaxy S5 China"; + compatible = "samsung,kltechn", "samsung,klte", "qcom,msm8974pro", "qcom,msm8974"; +}; + +&i2c_led_gpio { + scl-gpios = <&tlmm 61 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; + sda-gpios = <&tlmm 60 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>; +}; + +&i2c_led_gpioex_pins { + pins = "gpio60", "gpio61"; +};