From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E49B93DD52E for ; Tue, 21 Apr 2026 20:24:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776803069; cv=none; b=gW4kIZfKwC1gW5SE2qzpd42d/6NMZnDlDI2ylharqecdhfAByt9Rtn5C/biwB3cJgf8g0UtGJAzXgvpYH+UqTHf5W4Q22rfRYJyviWZD2sjZqissvUOqsUmaFxpNBcP4WeIu4rqYm+YlSIcxW6g22qzdDbyR2yvrtrEx81F0oOA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1776803069; c=relaxed/simple; bh=AZZ3BtHPYsdTJleQOEnSYeQu81ZAvH9LguAUd+n0Z5M=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=fBFfX5J2smCBPXtH8oHod9BauM/XFHzArklsfYF1NIqRq1A+NdJcnT6sZcXkjPCQ4VmpKWCumZXOi1/NLwvTwRchApD4h2zUzesWpdnqWxK2kydOhN2c0EmFp0MLJs6waQBRq6UPkZ/2cyW2jCzckgd4WcXpCVuFSJNM09PTcww= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IwFDgr8t; arc=none smtp.client-ip=209.85.128.42 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IwFDgr8t" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-48896199cbaso47872955e9.1 for ; Tue, 21 Apr 2026 13:24:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1776803066; x=1777407866; darn=lists.linux.dev; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ln8CSZ8Zjp4CpkydhHUfH+wLZviy2qiJkheYqbMUKrY=; b=IwFDgr8tqWgq9t5infpmgWg4ehC5EESc57Dbz6UHokDM+uxE8Cyz6E7F9crC52NgQO 6DQXSXhXoHng2qzss9sTqZ3iZx6mJSMhNqZoPMO5PgcEj3rm1JOn5N9O9+rFyv1yj+k3 GthpXO2oMtvXH4w6N/IpgCYoKc/xWVsK8YcqOyhJ9oqt8ANXNRTGmzUM+t4ZcoiVzOEM oYhOD9TPxvUEdMn9bsl2bSi6Za0fZnB2skYte11uf2j6i8s6E5q6djx8kW141ILjaW9X Oj0z9nsg4yA55tZcnojU0tHxN5bBXZPF+pNlKQBDdfVKE6Bln5IokArdec8xYJEGppBG i7yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776803066; x=1777407866; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=ln8CSZ8Zjp4CpkydhHUfH+wLZviy2qiJkheYqbMUKrY=; b=D7jWkRcTr21Fr4IKImsdSuX2wCJSIoWt2lej6qnnWN0oc8opKBq0ShP0xvbf1S2wTb 5ovUU1YCp3PR2VWYQDmW315ckG1QFWA9GpYUfg9VAWWwa8iGSEPMVhwxlESkix9LkSl0 fROiQ2DApOYHxlx8uJL9Ug26xzKAmfnN99p3XRiuVUvrHNUGBY362v4GaFD857mlN5LM zV5d5xBdcg3EBNDC9gIqHE7Ba+mWoWdvWtwtaeAp8+sOL12TbSlLF/dOb+zrysJ6Z8yZ pjnCznF6bCni99WlV/RzcN0RxSkgbn/5lBRcy1d34/6toht1e86KOb/TNU/jM04VxZ0P srMg== X-Forwarded-Encrypted: i=1; AFNElJ+i74pp9yWChGz00OgGvAYIqPXa44UxpXxjYiSyQFY1l/Z6sZLEitrlOV3R8PwfS92SYks=@lists.linux.dev X-Gm-Message-State: AOJu0YyRl0A1H5MyA3qtc2+gdwTEsX75VSWlJFPU2RRZ5fcmr2nstjOU dKCwDTOi0oUu//77oZYuHsDbNjWJZ6bWOxTQqRMKM5aRrplpf8qVXXtD X-Gm-Gg: AeBDievq5s3BIXNqHUEKGCrPSxQF6z/8axRzxYGCV6jO8OgQR8Vyj+LDth6tOL+MWP2 I+wx4bAMZ5lzuY/+VEzz0ybzIy0Nd64DfCsexxG4fxx7xjGSmGHYhmEAAGYTWXJ4qMm1L6KhJdW 27pb7deRzv3pSAKG8baKyEESe02CuB95lUiBp0rGNw0M4foImzqGSguMAsG55OAX7+svQuizc9R b0Zorq+sEfAqoeCqHDXGnb//O0dHcgRM789YcFFrJs/KMngitD6Xp7xkjRRwwo48msNAMC9BE7B 1zFMHIoDl1ZiCGR1/pJa4P0i0p7Mm2pyys4yViEx9CNHO275PUOx1YGEcWFMj1ISBNjxcjbgvNQ jN/K8kMvR5L5Zhy1bqBUoSood1z7tQ/xKTYdd52eATMJM6Zsghhqq0/0shNB03eZ20hn7fFy/QH lMXWGjwS8GGnFLN7y32Hdbr8VSUD9+tkJuCLflr8TrvAcuL49rub7VHLc= X-Received: by 2002:a05:600c:1554:b0:488:9bf8:7f17 with SMTP id 5b1f17b1804b1-488fb77810bmr289995225e9.14.1776803066229; Tue, 21 Apr 2026 13:24:26 -0700 (PDT) Received: from [192.168.0.2] ([197.250.227.85]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488fc0f82bbsm655989805e9.3.2026.04.21.13.24.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Apr 2026 13:24:25 -0700 (PDT) From: =?utf-8?q?Stefan_D=C3=B6singer?= Date: Tue, 21 Apr 2026 23:23:14 +0300 Subject: [PATCH v5 6/8] amba/serial: amba-pl011: Bring back zx29 UART support Precedence: bulk X-Mailing-List: soc@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20260421-send-v5-6-ace038e63515@gmail.com> References: <20260421-send-v5-0-ace038e63515@gmail.com> In-Reply-To: <20260421-send-v5-0-ace038e63515@gmail.com> To: Jonathan Corbet , Shuah Khan , Russell King , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Arnd Bergmann , Krzysztof Kozlowski , Alexandre Belloni , Linus Walleij , Drew Fustini , Greg Kroah-Hartman , Jiri Slaby Cc: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, soc@lists.linux.dev, linux-serial@vger.kernel.org, =?utf-8?q?Stefan_D=C3=B6singer?= X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=openpgp-sha256; l=2201; i=stefandoesinger@gmail.com; h=from:subject:message-id; bh=AZZ3BtHPYsdTJleQOEnSYeQu81ZAvH9LguAUd+n0Z5M=; b=owEBiQJ2/ZANAwAIAT0TvMhUTxoiAcsmYgBp59zXHYk8QOPpNQCe1Wwk6mIgsZ2Nv+zsJP4PY KWIaQ2iFOCJAk8EAAEIADkWIQRDFvS2qgVbJ5UyXWw9E7zIVE8aIgUCaefc1xsUgAAAAAAEAA5t YW51MiwyLjUrMS4xMiwyLDIACgkQPRO8yFRPGiKiQg//Zn2a8aaTZQuSyt4cwOh54RlDf15xzdQ txtA7aqXssFF/JqZI7GOWW8JhQFJ7mudZDNWHj53GnkJ+N0efuz+vAmSSM0WzemjCIOv/AjnQfs xM1HLgxBUk+iNuV1IhoEZXRAYHi9kPaZTyIVWJwOSaTK1p25+oHaarMzaw0ha2iuHPDm85HX8Qc pjo7Z4HI7M1cBoHAtMUZNQl1wX+H7QACSGNczRRSUrzBm3N2eieQDrp7LGTCwMKKkKVqQ9EQmSR 2RhVVi4qrzczHyTKhay88YorRUM7oMQBMfmtZ99qfNFpOjEG9P7f8pXklKuvIrDLW33fof3b54U ScQCF5mFC91rEKZFKsUyrK9inaaVV2+BcnvGsvC6uAnR27SNUYupEWKDo1LfFyKwgIc6uYWcfHN ATJP3//SliWsOvAaJOt83pn9Ehw1MiyPRjXpP+bCJFiIzzy148+Xrxu1pcBoE2PVa5OH+uuRXeu dyRui4+9dHU3z1/VY7Bq3GelKMFweEu9+TtAUquxeD//hrOfjKwo+TU94YQxI69V6fGUFm1bp5F yFhtFMKOnxda5r5rQW0WMIKcpI9B3i1kWlysqUnppG2Es8v1fSopis5Rq4jfkBCi6RTgW4gA6MV vSbrrsbXxHTulM9noIeSe9O+3MpHrqXMbGmrnpaBcFBQvEultgIE= X-Developer-Key: i=stefandoesinger@gmail.com; a=openpgp; fpr=4F9C2C8728019633893EBBB98CB81F9A72BBA155 This is based on code removed in commit 89d4f98ae90d ("ARM: remove zte zx platform"). I did not bring back the zx29-uart .compatible as the arm,primecell-periphid does the job. Signed-off-by: Stefan Dösinger --- Changes since v4: Use ZTE's JEDEC ID instead of 0xfe for the DT-Provided AMBA ID. --- drivers/tty/serial/amba-pl011.c | 42 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 7f17d288c807..f24cc403d9e0 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c @@ -216,6 +216,38 @@ static struct vendor_data vendor_st = { .get_fifosize = get_fifosize_st, }; +static const u16 pl011_zte_offsets[REG_ARRAY_SIZE] = { + [REG_DR] = ZX_UART011_DR, + [REG_FR] = ZX_UART011_FR, + [REG_LCRH_RX] = ZX_UART011_LCRH, + [REG_LCRH_TX] = ZX_UART011_LCRH, + [REG_IBRD] = ZX_UART011_IBRD, + [REG_FBRD] = ZX_UART011_FBRD, + [REG_CR] = ZX_UART011_CR, + [REG_IFLS] = ZX_UART011_IFLS, + [REG_IMSC] = ZX_UART011_IMSC, + [REG_RIS] = ZX_UART011_RIS, + [REG_MIS] = ZX_UART011_MIS, + [REG_ICR] = ZX_UART011_ICR, + [REG_DMACR] = ZX_UART011_DMACR, +}; + +static unsigned int get_fifosize_zte(struct amba_device *dev) +{ + return 16; +} + +static struct vendor_data vendor_zte = { + .reg_offset = pl011_zte_offsets, + .access_32b = true, + .ifls = UART011_IFLS_RX4_8 | UART011_IFLS_TX4_8, + .fr_busy = ZX_UART01x_FR_BUSY, + .fr_dsr = ZX_UART01x_FR_DSR, + .fr_cts = ZX_UART01x_FR_CTS, + .fr_ri = ZX_UART011_FR_RI, + .get_fifosize = get_fifosize_zte, +}; + /* Deals with DMA transactions */ struct pl011_dmabuf { @@ -3081,6 +3113,16 @@ static const struct amba_id pl011_ids[] = { .mask = 0x00ffffff, .data = &vendor_st, }, + { + /* This is an invented ID. The actual hardware that contains + * these ZTE UARTs (zx29 boards) has no AMBA PIDs stored. ZTE + * JEDEC ID (ignoring banks) and the "011" part number as used + * by ARM. + */ + .id = 0x0008c011, + .mask = 0x000fffff, + .data = &vendor_zte, + }, { 0, 0 }, }; -- 2.53.0