Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Two 6.12 DTS fixes #6508

Merged
merged 3 commits into from
Dec 3, 2024
Merged

Two 6.12 DTS fixes #6508

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c2312bf
dts: bcm2712-ds: Restore the A76 PMU declaration
pelwell Dec 3, 2024
c08c1ab
dts: rp1: Re-enable DMA to RP1 UART0
pelwell Dec 3, 2024
5290351
dts: bcm2712-ds: Restore gpio-direct to gio_aon
pelwell Dec 3, 2024
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
9 changes: 9 additions & 0 deletions arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@
};
#endif

arm-pmu {
compatible = "arm,cortex-a76-pmu";
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
};

clocks: clocks {
compatible = "simple-bus";
#address-cells = <1>;
Expand Down
6 changes: 3 additions & 3 deletions arch/arm64/boot/dts/broadcom/rp1.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
interrupts = <RP1_INT_UART0 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&rp1_clocks RP1_CLK_UART &rp1_clocks RP1_PLL_SYS_PRI_PH>;
clock-names = "uartclk", "apb_pclk";
// dmas = <&rp1_dma RP1_DMA_UART0_TX>,
// <&rp1_dma RP1_DMA_UART0_RX>;
// dma-names = "tx", "rx";
dmas = <&rp1_dma RP1_DMA_UART0_TX>,
<&rp1_dma RP1_DMA_UART0_RX>;
dma-names = "tx", "rx";
pinctrl-names = "default";
arm,primecell-periphid = <0x00541011>;
uart-has-rtscts;
Expand Down
Loading