Skip to content

[4.0.r1] Initial support for SoC Waipio and Nagara platform#2646

Open
bartcubbins wants to merge 36 commits into
sonyxperiadev:aosp/K.P.4.0.r1from
bartcubbins:40r1_waipio_bringup
Open

[4.0.r1] Initial support for SoC Waipio and Nagara platform#2646
bartcubbins wants to merge 36 commits into
sonyxperiadev:aosp/K.P.4.0.r1from
bartcubbins:40r1_waipio_bringup

Conversation

@bartcubbins
Copy link
Copy Markdown
Contributor

@bartcubbins bartcubbins commented May 13, 2026

Welcome Nagara platform on 6.6 kernel!
This PR contains a set of changes required for SoC Waipio and Nagara platform.
Some downstream drivers were added (GCC, PINCTRL, INTERCONNECT) despite the fact that the current kernel version has an upstream implementation, because we are closely tied to the driver stack provided by QTI.

Current status: The Nagara platform devices boot into Android.

bartcubbins and others added 30 commits May 12, 2026 19:41
Add arch support for Waipio platform.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
Add the clock handles for GCC, CAMCC, DISPCC, GPUCC and VIDEOCC
so that the clients can request on the clock ids.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
Add support for Global Clock Controller for clients to be able
to request for the clocks.
This snapshot is taken as of aosp/K.P.2.0.r1 commit c1c72bf
("clk: qcom: waipio: Register CCs with clk pm framework").

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
Add support for Camera Clock Controller for clients to be able
to request for the clocks.
This snapshot is taken as of aosp/K.P.2.0.r1 commit c1c72bf
("clk: qcom: waipio: Register CCs with clk pm framework").

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
Add support for Display Clock Controller for clients to be able
to request for the clocks.
This snapshot is taken as of aosp/K.P.2.0.r1 commit c1c72bf
("clk: qcom: waipio: Register CCs with clk pm framework").

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
Add support for Graphics Clock Controller for clients to be able
to request for the clocks.
This snapshot is taken as of aosp/K.P.2.0.r1 commit c1c72bf
("clk: qcom: waipio: Register CCs with clk pm framework").

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
Add support for Video Clock Controller for clients to be able
to request for the clocks.
This snapshot is taken as of aosp/K.P.2.0.r1 commit c1c72bf
("clk: qcom: waipio: Register CCs with clk pm framework").

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
Add support for Debug Clock Controller to support the clock
measurement for all other clock controllers.
This snapshot is taken as of aosp/K.P.2.0.r1 commit 25fdd67
("clk: qcom: debugcc-waipio: Allow parent caching during init").

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
Imported from 64.0.A.2.xxx SoMC Nagara XQ-CT72 release
Add support for Waipio pin configuration and control
in pinctrl framework.
This driver is based on aosp/K.P.2.0.r1 commit 48910be
("pinctrl: qcom: Rename some identifiers in waipio pinctrl driver").

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
Add egpio support for gpios 165 to 209 which are driven by APSS.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
Add master and slave ID constants for all Waipio interconnect
providers which consumers can use to set bandwidth constraints
and find paths in the NoC (Network-On-Chip) topology.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
Add interconnect providers for aggre1_noc, aggre2_noc, clk_virt,
config_noc, gem_noc, lpass_ag_noc, mc_virt, mmss_noc, nsp_noc,
pcie_anoc and system_noc.
This will allow consumers to get their path and set bandwidth
constraints on them.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
Probe deferral is not an error, so don't log this as an error:
[    0.310441] qnoc-waipio soc:interconnect@0: failed to register ICC provider, -517
[    0.311362] qnoc-waipio soc:interconnect@1: failed to register ICC provider, -517
[    0.312247] qnoc-waipio 1500000.interconnect: failed to register ICC provider, -517
[    0.313103] qnoc-waipio 1680000.interconnect: failed to register ICC provider, -517
[    0.313945] qnoc-waipio 16c0000.interconnect: failed to register ICC provider, -517
[    0.314915] qnoc-waipio 1740000.interconnect: failed to register ICC provider, -517
[    0.315752] qnoc-waipio 19100000.interconnect: failed to register ICC provider, -517
[    0.316627] qnoc-waipio 320c0000.interconnect: failed to register ICC provider, -517
[    0.317501] qnoc-waipio 3c40000.interconnect: failed to register ICC provider, -517

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
Add ADSP, CDSP, MPSS and SLPI remoteproc subsystems support.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
Some high-end SoCs dts require this header.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
Add initial device tree to support Waipio (v2) QRD
with PM8010.
This is based on aosp/K.P.2.0.r1 commit e45a15c
("dts: qcom: waipio: Fix sensors PDR location").

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
To maintain the current style, move the IPCLite device nodes
into a separate dts fragment.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
To maintain the current style, move the IPA device nodes
into a separate dts fragment.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
…ment

To maintain the current style, move the pwrlevels device nodes
into a separate dts fragment.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
To maintain the current style, move the BT device nodes
into a separate dts fragment.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
To maintain the current style, move the WLAN device nodes
into a separate dts fragment.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
The new ADC7 architecture binding has been changed to accept
the SID specified by the devicetree and use it to encode the
channel ID.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
Use the upstream compatible name for amoled regulator that
the current driver provides.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
The cacheinfo driver accepts only "cache" compatible devices.
Update the compatible string for L2 and L3 cache nodes to
"cache" to ensure proper parsing.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
The kernel device tree fstab for early mounting is deprecated,
and userspace first_stage_mount is used instead.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
Add support for ice wrapped keys to the ufshc.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
Use the upstream compatible name for RPMH clk that the
current driver provides.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
The current kernel provides two PMIC GLINK driver versions;
use the driver supplied by QTI.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
The LLCC block consists of multiple banks, each having its own base
address with gaps between them. Therefore, representing all banks
using a single offset and size is incorrect. Instead, each bank
must be described separately with its corresponding base address
and exact size. Also update compatible name.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
Use the upstream compatible name for AOSS QMP that the
current driver provides.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
Update the QoS danger/safe/creq LUT configs and VBIF remapper
configs entries to reflect the SDE HW catalog driver changes.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
DP PLL is now handled by a standalone driver.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
Rename qcom,is-used-swr-gpio to qcom,swr-gpio-is-used because this
property has nothing to do with GPIO binding, moreover, this is a
simple bool flag, but unfortunately due to driver implementation
it is implemented as u32.
The change requires a corresponding renaming in the driver.

Fixes:
arch/arm64/boot/dts/vendor/qcom/audio/waipio-audio-overlay.dtsi:37.3-31:
Warning (gpios_property): /soc/spf_core_platform/lpass-cdc/va-macro@33F0000:
qcom,is-used-swr-gpio: cell 0 is not a phandle reference
arch/arm64/boot/dts/vendor/qcom/audio/waipio-audio.dtsi:125.30-128.5:
Warning (gpios_property): /soc/spf_core_platform/lpass-cdc/va-macro@33F0000:
Missing property '#gpio-cells' in node /soc/interrupt-controller@17100000 or
bad phandle (referred from qcom,is-used-swr-gpio[0])

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
This is an initial bringup for Nagara platform PDX-223, PDX-224
devices (Xperia 1 IV and Xperia 5 IV accordingly).

This is based on aosp/K.P.2.0.r1 commit 95d0625
("dts: qcom: Nagara: Initial camera bring up").

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
The new ADC7 architecture binding has been changed to accept
the SID specified by the devicetree and use it to encode the
channel ID.

Signed-off-by: Pavel Dubrova <pashadubrova@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants