Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 43 additions & 0 deletions arch/arm64/boot/dts/exynos/google/zumapro-tegu.dts
Original file line number Diff line number Diff line change
Expand Up @@ -272,6 +272,21 @@
};
};

/*
* The ST54L's chip enable (gpa0-1) powers the whole chip, NFC and its
* secure element; stock's eSE driver raises it at probe
* (ese_chip_enable-gpio in Google's GPL zuma-tegu-ese.dtsi). Nothing here
* drives the eSE, so hold it high.
*/
&gpa0 {
nfc-chip-enable-hog {
gpio-hog;
gpios = <1 GPIO_ACTIVE_HIGH>;
output-high;
line-name = "nfc-chip-enable";
};
};

/* The keys' banks and the touchscreen's raise their own interrupts. */
&gpa4 {
interrupt-controller;
Expand Down Expand Up @@ -305,6 +320,20 @@
<GIC_SPI 35 IRQ_TYPE_LEVEL_HIGH>;
};

/* The NFC controller's interrupt (gpa7-5). */
&gpa7 {
interrupt-controller;
#interrupt-cells = <2>;
interrupts = <GIC_SPI 36 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 39 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 40 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
};

/* The USB-C port controller's interrupt (gpa8-3). */
&gpa8 {
interrupt-controller;
Expand Down Expand Up @@ -421,6 +450,20 @@
cirrus,lra-redc-micro-ohms = <14100007>;
cirrus,vpbr-threshold-microvolt = <3008000>;
};

/*
* The ST54L NFC controller: plain NCI over I2C, nxp-nci's transport.
* Its "enable" line is the chip's RST_N; the PMU's clock pad gives it
* its reference clock.
*/
nfc@8 {
compatible = "st,st54l", "nxp,nxp-nci-i2c";
reg = <0x08>;
clocks = <&pmu_system_controller 0>;
interrupt-parent = <&gpa7>;
interrupts = <5 IRQ_TYPE_LEVEL_HIGH>;
enable-gpios = <&gph1 6 GPIO_ACTIVE_HIGH>;
};
};

&pinctrl_alive {
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/exynos/google/zumapro.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -1315,6 +1315,7 @@
pmu_system_controller: system-controller@15460000 {
compatible = "google,zumapro-pmu", "google,zuma-pmu";
reg = <0x0 0x15460000 0x10000>;
#clock-cells = <1>;
status = "disabled";

reboot_mode: reboot-mode {
Expand Down