From patchwork Thu Feb 15 18:01:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Stefan Hansson X-Patchwork-Id: 201686 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:c619:b0:108:e6aa:91d0 with SMTP id hn25csp21793dyb; Thu, 15 Feb 2024 10:04:50 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCX7maCOpn8dPIBIeEMHlajYdqAZDsKPNzjzazKONzANi8jyJs/sWd5T8lr+EMKvWaYyH1hFynDTsW5Bey2V2gHOv0qOHA== X-Google-Smtp-Source: AGHT+IGUwg05Fp6F/CK5H5bm+686MHERdWSphyLGXgLtlPidy5lgkfw6MK1R6gVFaBVcCn6DToki X-Received: by 2002:a17:906:f28c:b0:a3d:ac47:614a with SMTP id gu12-20020a170906f28c00b00a3dac47614amr974147ejb.10.1708020290568; Thu, 15 Feb 2024 10:04:50 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708020290; cv=pass; d=google.com; s=arc-20160816; b=xJsnB2dLyUfJQMsHFQNXV+YDlcuNvg7oP6BDhS2jhsaGZm2InxzBKqmMHgYl8BDfaz HzGs4qcJ1y++lDb66Zo6BlPWnFblLAG9Tjm8oPdVPbZdntSNHjdQhDv3dLv2nq3lVagT Y3VOlx207SW+T22L3tZDahUYRNPWs9Ec1U3iaA90QEYF1spm5N8xzrFToGl3WPgeUAFh kwMQugeqyHpj1MRy7Lb/gXI75nAkCOZzl3qN3pTyYCcreBAwBilSps4xq42aoVETfGeV 2xHIl7Y4m9LY7BhHQ9v1+5+7IHjagUhI5bqxc17MPUsck3dljA/RFpAafbuYs4d0vyTT SAXQ== ARC-Message-Signature: i=2; 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; bh=u8OYjnytavyuK1ooZ6JVVOU4O9TdVVegn54cJnCjT7U=; fh=BOHMyQNoNwruHbyPjEZug/JXZ4HRZPnvk4WDFKc+FWM=; b=m4oizlSm/pwZH/OjyUIr4t0eWJVPxRPVzpKNnIw55/sIfCJ/Wqld3C4Cu4BG8a2y+1 HLpW2PurkwRXrD2//fxnEFtBnkrwl+H9vwS3ZGUGU03xYJKWb2+tQv7JK2FRov9nQg0L V2EK9KAr0U/qigMAZPZMrKP9PU+Z6EmS2hTLwJfZWJ/WnjXtFhR3MBmQAQV5F+mTQU61 zc13wyQMGFpG/15CKX3KssBk3U+gGN443cEczC9cgCBwb3KebNmYXi6m2Oi+8GGtCV53 TWC5b9mcIfzSW3FxqNhGio/FSk8dApxA9b8ql68x40ROQe6EbXOKUkJkqtr0CMB1m95I ZLNg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@postmarketos.org header.s=key1 header.b=oYhuob+B; arc=pass (i=1 spf=pass spfdomain=postmarketos.org dkim=pass dkdomain=postmarketos.org dmarc=pass fromdomain=postmarketos.org); spf=pass (google.com: domain of linux-kernel+bounces-67467-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-67467-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=postmarketos.org Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id p18-20020a1709060e9200b00a3d65494804si866000ejf.297.2024.02.15.10.04.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Feb 2024 10:04:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-67467-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@postmarketos.org header.s=key1 header.b=oYhuob+B; arc=pass (i=1 spf=pass spfdomain=postmarketos.org dkim=pass dkdomain=postmarketos.org dmarc=pass fromdomain=postmarketos.org); spf=pass (google.com: domain of linux-kernel+bounces-67467-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-67467-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=postmarketos.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 028421F21F97 for ; Thu, 15 Feb 2024 18:04:50 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 5519A13A893; Thu, 15 Feb 2024 18:03:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=postmarketos.org header.i=@postmarketos.org header.b="oYhuob+B" Received: from out-180.mta0.migadu.com (out-180.mta0.migadu.com [91.218.175.180]) (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 C6D5713849B for ; Thu, 15 Feb 2024 18:03:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708020215; cv=none; b=FNlBYyt+pRdoT/VmKa6gJ2bDR0GNEsqLdDS8LdspxWTejVE/JEZ2dA3sKD+Wz8iopm3n2+JhQBbIdfEZ2OMYzF6+GJxiGVMF+gpHRt/Wc8K4a59OVYIG+kR3bCk0+Bt/EzP+NtBbMxBmTWMRSd7c8JWXn/HsFTdRSucyKzP1x24= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708020215; c=relaxed/simple; bh=Txd+1IeG13ZW41fycKpLPUTBldOE5VLB5/uwpXHaSFM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=Pvp5OlwWxp3O35BoakUmmaU04OE7V/YwS0m+DhNYp+hQFHfeheCyH6igGpe5TVP+d63RmMRfn2fCl3dxA7TnSHVGx8rZUdn0yiWHkIjnxciSHo5CIOfyaY4sySNfubHSuLsFBUe9/zk39ZTxk5RQ7NFevOIR2d8tkwAbgoEzt7k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=postmarketos.org; spf=pass smtp.mailfrom=postmarketos.org; dkim=pass (2048-bit key) header.d=postmarketos.org header.i=@postmarketos.org header.b=oYhuob+B; arc=none smtp.client-ip=91.218.175.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=postmarketos.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=postmarketos.org X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=postmarketos.org; s=key1; t=1708020210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u8OYjnytavyuK1ooZ6JVVOU4O9TdVVegn54cJnCjT7U=; b=oYhuob+BNZXcll9D9W+zTJTpmaGMe/6lSTEdRm7wmXZPVfXbBCLB4+lVdE3fBECSTgQBpq 6Y53m4ygaZWn9VIGiMxmCvB3Vi42TMQkC6uAVkDne8ZLvJ5sQF0I0I4joMd5Y7FLSnn/TG 6Va6OOLns3TH8rdzkkSkI+swwTPiBLPPvtEUJTJfBieNV642Q2J7ot44j17LGsIcNEYY1L PvdUKqSdt/Ridzpu9DYoT6ccShd/9nC9BlbGThw3Ljp7y3AKaC4R+IFSqqvf9uaLfFlTD/ sY4UQAfGrYwIginAVdaZP8383hti7Kt6Rbm73rvRmDxT5QtH8oDd7InVrHZ7zA== From: Stefan Hansson To: Bjorn Andersson , Konrad Dybcio , Rob Herring , Krzysztof Kozlowski , Conor Dooley , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Cc: ~postmarketos/upstreaming@lists.sr.ht, phone-devel@vger.kernel.org, Stefan Hansson , Krzysztof Kozlowski Subject: [PATCH v6 1/4] ARM: dts: qcom: samsung-matisse-common: Add initial common device tree Date: Thu, 15 Feb 2024 19:01:59 +0100 Message-ID: <20240215180322.99089-2-newbyte@postmarketos.org> In-Reply-To: <20240215180322.99089-1-newbyte@postmarketos.org> References: <20240215180322.99089-1-newbyte@postmarketos.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790989083731824330 X-GMAIL-MSGID: 1790989083731824330 According to the dts from the kernel source code released by Samsung, matissewifi and matisselte only have minor differences in hardware, so use a shared dtsi to reduce duplicated code. Additionally, this should make adding support for matisse3g easier should someone want to do that at a later point. As such, add a common device tree for all matisse devices by Samsung based on the matissewifi dts. Support for matisselte will be introduced in a later patch in this series and will use the common dtsi as well. Signed-off-by: Stefan Hansson Reviewed-by: Krzysztof Kozlowski --- .../qcom-apq8026-samsung-matisse-wifi.dts | 609 +++--------------- ... qcom-msm8226-samsung-matisse-common.dtsi} | 73 --- 2 files changed, 83 insertions(+), 599 deletions(-) rewrite arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts (84%) copy arch/arm/boot/dts/qcom/{qcom-apq8026-samsung-matisse-wifi.dts => qcom-msm8226-samsung-matisse-common.dtsi} (85%) diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts b/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts dissimilarity index 84% index 0c28309c6cc5..ac8aef5f9d09 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts +++ b/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts @@ -1,526 +1,83 @@ -// SPDX-License-Identifier: BSD-3-Clause -/* - * Copyright (c) 2022, Matti Lehtimäki - */ - -/dts-v1/; - -#include -#include "qcom-msm8226.dtsi" -#include "pm8226.dtsi" - -/delete-node/ &adsp_region; -/delete-node/ &smem_region; - -/ { - model = "Samsung Galaxy Tab 4 10.1"; - compatible = "samsung,matisse-wifi", "qcom,apq8026"; - chassis-type = "tablet"; - - aliases { - mmc0 = &sdhc_1; /* SDC1 eMMC slot */ - mmc1 = &sdhc_2; /* SDC2 SD card slot */ - display0 = &framebuffer0; - }; - - chosen { - #address-cells = <1>; - #size-cells = <1>; - ranges; - - stdout-path = "display0"; - - framebuffer0: framebuffer@3200000 { - compatible = "simple-framebuffer"; - reg = <0x03200000 0x800000>; - width = <1280>; - height = <800>; - stride = <(1280 * 3)>; - format = "r8g8b8"; - }; - }; - - gpio-hall-sensor { - compatible = "gpio-keys"; - - event-hall-sensor { - label = "Hall Effect Sensor"; - gpios = <&tlmm 110 GPIO_ACTIVE_LOW>; - linux,input-type = ; - linux,code = ; - debounce-interval = <15>; - linux,can-disable; - wakeup-source; - }; - }; - - gpio-keys { - compatible = "gpio-keys"; - autorepeat; - - key-home { - label = "Home"; - gpios = <&tlmm 108 GPIO_ACTIVE_LOW>; - linux,code = ; - debounce-interval = <15>; - }; - - key-volume-down { - label = "Volume Down"; - gpios = <&tlmm 107 GPIO_ACTIVE_LOW>; - linux,code = ; - debounce-interval = <15>; - }; - - key-volume-up { - label = "Volume Up"; - gpios = <&tlmm 106 GPIO_ACTIVE_LOW>; - linux,code = ; - debounce-interval = <15>; - }; - }; - - i2c-backlight { - compatible = "i2c-gpio"; - sda-gpios = <&tlmm 20 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; - scl-gpios = <&tlmm 21 (GPIO_ACTIVE_HIGH|GPIO_OPEN_DRAIN)>; - - pinctrl-0 = <&backlight_i2c_default_state>; - pinctrl-names = "default"; - - i2c-gpio,delay-us = <4>; - - #address-cells = <1>; - #size-cells = <0>; - - backlight@2c { - compatible = "ti,lp8556"; - reg = <0x2c>; - - dev-ctrl = /bits/ 8 <0x80>; - init-brt = /bits/ 8 <0x3f>; - - pwms = <&backlight_pwm 0 100000>; - pwm-names = "lp8556"; - - rom-a0h { - rom-addr = /bits/ 8 <0xa0>; - rom-val = /bits/ 8 <0x44>; - }; - - rom-a1h { - rom-addr = /bits/ 8 <0xa1>; - rom-val = /bits/ 8 <0x6c>; - }; - - rom-a5h { - rom-addr = /bits/ 8 <0xa5>; - rom-val = /bits/ 8 <0x24>; - }; - }; - }; - - backlight_pwm: pwm { - compatible = "clk-pwm"; - #pwm-cells = <2>; - clocks = <&mmcc CAMSS_GP0_CLK>; - pinctrl-0 = <&backlight_pwm_default_state>; - pinctrl-names = "default"; - }; - - reg_tsp_1p8v: regulator-tsp-1p8v { - compatible = "regulator-fixed"; - regulator-name = "tsp_1p8v"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - - gpio = <&tlmm 31 GPIO_ACTIVE_HIGH>; - enable-active-high; - - pinctrl-names = "default"; - pinctrl-0 = <&tsp_en_default_state>; - }; - - reg_tsp_3p3v: regulator-tsp-3p3v { - compatible = "regulator-fixed"; - regulator-name = "tsp_3p3v"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - - gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>; - enable-active-high; - - pinctrl-names = "default"; - pinctrl-0 = <&tsp_en1_default_state>; - }; - - reserved-memory { - #address-cells = <1>; - #size-cells = <1>; - ranges; - - framebuffer@3200000 { - reg = <0x03200000 0x800000>; - no-map; - }; - - mpss@8400000 { - reg = <0x08400000 0x1f00000>; - no-map; - }; - - mba@a300000 { - reg = <0x0a300000 0x100000>; - no-map; - }; - - reserved@cb00000 { - reg = <0x0cb00000 0x700000>; - no-map; - }; - - wcnss@d200000 { - reg = <0x0d200000 0x700000>; - no-map; - }; - - adsp_region: adsp@d900000 { - reg = <0x0d900000 0x1800000>; - no-map; - }; - - venus@f100000 { - reg = <0x0f100000 0x500000>; - no-map; - }; - - smem_region: smem@fa00000 { - reg = <0x0fa00000 0x100000>; - no-map; - }; - - reserved@fb00000 { - reg = <0x0fb00000 0x260000>; - no-map; - }; - - rfsa@fd60000 { - reg = <0x0fd60000 0x20000>; - no-map; - }; - - rmtfs@fd80000 { - compatible = "qcom,rmtfs-mem"; - reg = <0x0fd80000 0x180000>; - no-map; - - qcom,client-id = <1>; - }; - }; -}; - -&adsp { - status = "okay"; -}; - -&blsp1_i2c2 { - status = "okay"; - - accelerometer@1d { - compatible = "st,lis2hh12"; - reg = <0x1d>; - - interrupt-parent = <&tlmm>; - interrupts = <54 IRQ_TYPE_LEVEL_HIGH>; - - pinctrl-names = "default"; - pinctrl-0 = <&accel_int_default_state>; - - st,drdy-int-pin = <1>; - - vdd-supply = <&pm8226_l19>; - vddio-supply = <&pm8226_lvs1>; - }; -}; - -&blsp1_i2c4 { - status = "okay"; - - muic: usb-switch@25 { - compatible = "siliconmitus,sm5502-muic"; - reg = <0x25>; - - interrupt-parent = <&tlmm>; - interrupts = <67 IRQ_TYPE_EDGE_FALLING>; - - pinctrl-names = "default"; - pinctrl-0 = <&muic_int_default_state>; - }; -}; - -&blsp1_i2c5 { - status = "okay"; - - touchscreen@4a { - compatible = "atmel,maxtouch"; - reg = <0x4a>; - - interrupt-parent = <&tlmm>; - interrupts = <17 IRQ_TYPE_LEVEL_LOW>; - - linux,keycodes = , - , - , - , - , - ; - - pinctrl-names = "default"; - pinctrl-0 = <&tsp_int_rst_default_state>; - - reset-gpios = <&pm8226_gpios 6 GPIO_ACTIVE_LOW>; - - vdd-supply = <®_tsp_1p8v>; - vdda-supply = <®_tsp_3p3v>; - }; -}; - -&rpm_requests { - regulators { - compatible = "qcom,rpm-pm8226-regulators"; - - pm8226_s3: s3 { - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1300000>; - }; - - pm8226_s4: s4 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - pm8226_s5: s5 { - regulator-min-microvolt = <1150000>; - regulator-max-microvolt = <1150000>; - }; - - pm8226_l1: l1 { - regulator-min-microvolt = <1225000>; - regulator-max-microvolt = <1225000>; - }; - - pm8226_l2: l2 { - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; - }; - - pm8226_l3: l3 { - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <1337500>; - regulator-always-on; - }; - - pm8226_l4: l4 { - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; - }; - - pm8226_l5: l5 { - regulator-min-microvolt = <1200000>; - regulator-max-microvolt = <1200000>; - }; - - pm8226_l6: l6 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - }; - - pm8226_l7: l7 { - regulator-min-microvolt = <1850000>; - regulator-max-microvolt = <1850000>; - }; - - pm8226_l8: l8 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-always-on; - }; - - pm8226_l9: l9 { - regulator-min-microvolt = <2050000>; - regulator-max-microvolt = <2050000>; - }; - - pm8226_l10: l10 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - pm8226_l12: l12 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - pm8226_l14: l14 { - regulator-min-microvolt = <2750000>; - regulator-max-microvolt = <2750000>; - }; - - pm8226_l15: l15 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - }; - - pm8226_l16: l16 { - regulator-min-microvolt = <3000000>; - regulator-max-microvolt = <3350000>; - }; - - pm8226_l17: l17 { - regulator-min-microvolt = <2950000>; - regulator-max-microvolt = <2950000>; - - regulator-system-load = <200000>; - regulator-allow-set-load; - regulator-always-on; - }; - - pm8226_l18: l18 { - regulator-min-microvolt = <2950000>; - regulator-max-microvolt = <2950000>; - }; - - pm8226_l19: l19 { - regulator-min-microvolt = <2850000>; - regulator-max-microvolt = <3000000>; - }; - - pm8226_l20: l20 { - regulator-min-microvolt = <3075000>; - regulator-max-microvolt = <3075000>; - }; - - pm8226_l21: l21 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <2950000>; - }; - - pm8226_l22: l22 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3000000>; - }; - - pm8226_l23: l23 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - }; - - pm8226_l24: l24 { - regulator-min-microvolt = <1300000>; - regulator-max-microvolt = <1350000>; - }; - - pm8226_l25: l25 { - regulator-min-microvolt = <1775000>; - regulator-max-microvolt = <2125000>; - }; - - pm8226_l26: l26 { - regulator-min-microvolt = <1225000>; - regulator-max-microvolt = <1300000>; - }; - - pm8226_l27: l27 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - }; - - pm8226_l28: l28 { - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <2950000>; - }; - - pm8226_lvs1: lvs1 {}; - }; -}; - -&sdhc_1 { - vmmc-supply = <&pm8226_l17>; - vqmmc-supply = <&pm8226_l6>; - - bus-width = <8>; - non-removable; - - status = "okay"; -}; - -&sdhc_2 { - vmmc-supply = <&pm8226_l18>; - vqmmc-supply = <&pm8226_l21>; - - bus-width = <4>; - cd-gpios = <&tlmm 38 GPIO_ACTIVE_LOW>; - - status = "okay"; -}; - -&tlmm { - accel_int_default_state: accel-int-default-state { - pins = "gpio54"; - function = "gpio"; - drive-strength = <2>; - bias-disable; - }; - - backlight_i2c_default_state: backlight-i2c-default-state { - pins = "gpio20", "gpio21"; - function = "gpio"; - drive-strength = <2>; - bias-disable; - }; - - backlight_pwm_default_state: backlight-pwm-default-state { - pins = "gpio33"; - function = "gp0_clk"; - }; - - muic_int_default_state: muic-int-default-state { - pins = "gpio67"; - function = "gpio"; - drive-strength = <2>; - bias-disable; - }; - - tsp_en_default_state: tsp-en-default-state { - pins = "gpio31"; - function = "gpio"; - drive-strength = <2>; - bias-disable; - }; - - tsp_en1_default_state: tsp-en1-default-state { - pins = "gpio73"; - function = "gpio"; - drive-strength = <2>; - bias-disable; - }; - - tsp_int_rst_default_state: tsp-int-rst-default-state { - pins = "gpio17"; - function = "gpio"; - drive-strength = <10>; - bias-pull-up; - }; -}; - -&usb { - extcon = <&muic>, <&muic>; - status = "okay"; -}; - -&usb_hs_phy { - extcon = <&muic>; - v1p8-supply = <&pm8226_l10>; - v3p3-supply = <&pm8226_l20>; -}; +// SPDX-License-Identifier: BSD-3-Clause +/* + * Copyright (c) 2022, Matti Lehtimäki + */ + +/dts-v1/; + +#include "qcom-msm8226-samsung-matisse-common.dtsi" + +/ { + model = "Samsung Galaxy Tab 4 10.1"; + compatible = "samsung,matisse-wifi", "qcom,apq8026"; + chassis-type = "tablet"; + + reg_tsp_3p3v: regulator-tsp-3p3v { + compatible = "regulator-fixed"; + regulator-name = "tsp_3p3v"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + + gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>; + enable-active-high; + + pinctrl-names = "default"; + pinctrl-0 = <&tsp_en1_default_state>; + }; +}; + +&blsp1_i2c2 { + status = "okay"; + + accelerometer@1d { + compatible = "st,lis2hh12"; + reg = <0x1d>; + + interrupt-parent = <&tlmm>; + interrupts = <54 IRQ_TYPE_LEVEL_HIGH>; + + pinctrl-names = "default"; + pinctrl-0 = <&accel_int_default_state>; + + st,drdy-int-pin = <1>; + + vdd-supply = <&pm8226_l19>; + vddio-supply = <&pm8226_lvs1>; + }; +}; + +&blsp1_i2c5 { + status = "okay"; + + touchscreen@4a { + compatible = "atmel,maxtouch"; + reg = <0x4a>; + + interrupt-parent = <&tlmm>; + interrupts = <17 IRQ_TYPE_LEVEL_LOW>; + + linux,keycodes = , + , + , + , + , + ; + + pinctrl-names = "default"; + pinctrl-0 = <&tsp_int_rst_default_state>; + + reset-gpios = <&pm8226_gpios 6 GPIO_ACTIVE_LOW>; + + vdd-supply = <®_tsp_1p8v>; + vdda-supply = <®_tsp_3p3v>; + }; +}; + +&tlmm { + tsp_en1_default_state: tsp-en1-default-state { + pins = "gpio73"; + function = "gpio"; + drive-strength = <2>; + bias-disable; + }; +}; diff --git a/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts b/arch/arm/boot/dts/qcom/qcom-msm8226-samsung-matisse-common.dtsi similarity index 85% copy from arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts copy to arch/arm/boot/dts/qcom/qcom-msm8226-samsung-matisse-common.dtsi index 0c28309c6cc5..6d116f9b443b 100644 --- a/arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts +++ b/arch/arm/boot/dts/qcom/qcom-msm8226-samsung-matisse-common.dtsi @@ -3,8 +3,6 @@ * Copyright (c) 2022, Matti Lehtimäki */ -/dts-v1/; - #include #include "qcom-msm8226.dtsi" #include "pm8226.dtsi" @@ -13,10 +11,6 @@ /delete-node/ &smem_region; / { - model = "Samsung Galaxy Tab 4 10.1"; - compatible = "samsung,matisse-wifi", "qcom,apq8026"; - chassis-type = "tablet"; - aliases { mmc0 = &sdhc_1; /* SDC1 eMMC slot */ mmc1 = &sdhc_2; /* SDC2 SD card slot */ @@ -141,19 +135,6 @@ reg_tsp_1p8v: regulator-tsp-1p8v { pinctrl-0 = <&tsp_en_default_state>; }; - reg_tsp_3p3v: regulator-tsp-3p3v { - compatible = "regulator-fixed"; - regulator-name = "tsp_3p3v"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - - gpio = <&tlmm 73 GPIO_ACTIVE_HIGH>; - enable-active-high; - - pinctrl-names = "default"; - pinctrl-0 = <&tsp_en1_default_state>; - }; - reserved-memory { #address-cells = <1>; #size-cells = <1>; @@ -223,26 +204,6 @@ &adsp { status = "okay"; }; -&blsp1_i2c2 { - status = "okay"; - - accelerometer@1d { - compatible = "st,lis2hh12"; - reg = <0x1d>; - - interrupt-parent = <&tlmm>; - interrupts = <54 IRQ_TYPE_LEVEL_HIGH>; - - pinctrl-names = "default"; - pinctrl-0 = <&accel_int_default_state>; - - st,drdy-int-pin = <1>; - - vdd-supply = <&pm8226_l19>; - vddio-supply = <&pm8226_lvs1>; - }; -}; - &blsp1_i2c4 { status = "okay"; @@ -258,33 +219,6 @@ muic: usb-switch@25 { }; }; -&blsp1_i2c5 { - status = "okay"; - - touchscreen@4a { - compatible = "atmel,maxtouch"; - reg = <0x4a>; - - interrupt-parent = <&tlmm>; - interrupts = <17 IRQ_TYPE_LEVEL_LOW>; - - linux,keycodes = , - , - , - , - , - ; - - pinctrl-names = "default"; - pinctrl-0 = <&tsp_int_rst_default_state>; - - reset-gpios = <&pm8226_gpios 6 GPIO_ACTIVE_LOW>; - - vdd-supply = <®_tsp_1p8v>; - vdda-supply = <®_tsp_3p3v>; - }; -}; - &rpm_requests { regulators { compatible = "qcom,rpm-pm8226-regulators"; @@ -499,13 +433,6 @@ tsp_en_default_state: tsp-en-default-state { bias-disable; }; - tsp_en1_default_state: tsp-en1-default-state { - pins = "gpio73"; - function = "gpio"; - drive-strength = <2>; - bias-disable; - }; - tsp_int_rst_default_state: tsp-int-rst-default-state { pins = "gpio17"; function = "gpio";