Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: beagleboard/linux
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7cd111425a684115667a4129f3bbf2645a920bef
Choose a base ref
..
head repository: beagleboard/linux
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bce804e2be51e159656096baa4d06ad70e278650
Choose a head ref
10 changes: 5 additions & 5 deletions arch/arm64/boot/dts/ti/k3-am625-skeleton.dts
Original file line number Diff line number Diff line change
@@ -55,19 +55,19 @@

mcu_m4fss_memory_region: m4f-memory@9cc00000 {
compatible = "shared-dma-pool";
reg = <0x00 0x9cc00000 0x00 0xd00000>;
reg = <0x00 0x9cc00000 0x00 0xe00000>;
no-map;
};

wkup_r5fss0_core0_dma_memory_region: r5f-dma-memory@9d900000 {
wkup_r5fss0_core0_dma_memory_region: r5f-dma-memory@9da00000 {
compatible = "shared-dma-pool";
reg = <0x00 0x9d900000 0x00 0x00100000>;
reg = <0x00 0x9da00000 0x00 0x00100000>;
no-map;
};

wkup_r5fss0_core0_memory_region: r5f-memory@9da00000 {
wkup_r5fss0_core0_memory_region: r5f-memory@9db00000 {
compatible = "shared-dma-pool";
reg = <0x00 0x9da00000 0x00 0x00d00000>;
reg = <0x00 0x9db00000 0x00 0x00c00000>;
no-map;
};

10 changes: 5 additions & 5 deletions arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi
Original file line number Diff line number Diff line change
@@ -58,19 +58,19 @@

mcu_m4fss_memory_region: m4f-memory@9cc00000 {
compatible = "shared-dma-pool";
reg = <0x00 0x9cc00000 0x00 0xd00000>;
reg = <0x00 0x9cc00000 0x00 0xe00000>;
no-map;
};

wkup_r5fss0_core0_dma_memory_region: r5f-dma-memory@9d900000 {
wkup_r5fss0_core0_dma_memory_region: r5f-dma-memory@9da00000 {
compatible = "shared-dma-pool";
reg = <0x00 0x9d900000 0x00 0x00100000>;
reg = <0x00 0x9da00000 0x00 0x00100000>;
no-map;
};

wkup_r5fss0_core0_memory_region: r5f-memory@9da00000 {
wkup_r5fss0_core0_memory_region: r5f-memory@9db00000 {
compatible = "shared-dma-pool";
reg = <0x00 0x9da00000 0x00 0x00d00000>;
reg = <0x00 0x9db00000 0x00 0x00c00000>;
no-map;
};

2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi
Original file line number Diff line number Diff line change
@@ -103,7 +103,7 @@
#interrupt-cells = <1>;
ti,sci = <&sms>;
ti,sci-dev-id = <148>;
ti,interrupt-ranges = <8 360 56>;
ti,interrupt-ranges = <8 392 56>;
};

main_pmx0: pinctrl@11c000 {
2 changes: 1 addition & 1 deletion arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi
Original file line number Diff line number Diff line change
@@ -65,7 +65,7 @@
#interrupt-cells = <1>;
ti,sci = <&sms>;
ti,sci-dev-id = <125>;
ti,interrupt-ranges = <16 928 16>;
ti,interrupt-ranges = <16 960 16>;
};

mcu_conf: syscon@40f00000 {
53 changes: 53 additions & 0 deletions arch/arm64/boot/dts/ti/k3-j784s4-evm.dts
Original file line number Diff line number Diff line change
@@ -21,6 +21,7 @@

aliases {
serial2 = &main_uart8;
mmc0 = &main_sdhci0;
mmc1 = &main_sdhci1;
i2c0 = &main_i2c0;
};
@@ -537,6 +538,24 @@
J784S4_WKUP_IOPAD(0x098, PIN_INPUT, 0) /* (B35) MCU_MDIO0_MDIO */
>;
};

mcu_fss0_ospi0_pins_default: mcu-fss0-ospi0-pins-default {
pinctrl-single,pins = <
J784S4_WKUP_IOPAD(0x000, PIN_OUTPUT, 0) /* (E32) MCU_OSPI0_CLK */
J784S4_WKUP_IOPAD(0x02c, PIN_OUTPUT, 0) /* (A32) MCU_OSPI0_CSn0 */
J784S4_WKUP_IOPAD(0x00c, PIN_INPUT, 0) /* (B33) MCU_OSPI0_D0 */
J784S4_WKUP_IOPAD(0x010, PIN_INPUT, 0) /* (B32) MCU_OSPI0_D1 */
J784S4_WKUP_IOPAD(0x014, PIN_INPUT, 0) /* (C33) MCU_OSPI0_D2 */
J784S4_WKUP_IOPAD(0x018, PIN_INPUT, 0) /* (C35) MCU_OSPI0_D3 */
J784S4_WKUP_IOPAD(0x01c, PIN_INPUT, 0) /* (D33) MCU_OSPI0_D4 */
J784S4_WKUP_IOPAD(0x020, PIN_INPUT, 0) /* (D34) MCU_OSPI0_D5 */
J784S4_WKUP_IOPAD(0x024, PIN_INPUT, 0) /* (E34) MCU_OSPI0_D6 */
J784S4_WKUP_IOPAD(0x028, PIN_INPUT, 0) /* (E33) MCU_OSPI0_D7 */
J784S4_WKUP_IOPAD(0x008, PIN_INPUT, 0) /* (C34) MCU_OSPI0_DQS */
J784S4_WKUP_IOPAD(0x03c, PIN_OUTPUT, 6) /* (C32) MCU_OSPI0_CSn3.MCU_OSPI0_ECC_FAIL */
J784S4_WKUP_IOPAD(0x038, PIN_OUTPUT, 6) /* (B34) MCU_OSPI0_CSn2.MCU_OSPI0_RESET_OUT0 */
>;
};
};

&main_uart8 {
@@ -594,6 +613,14 @@
};
};

&main_sdhci0 {
/* eMMC */
status = "okay";
non-removable;
ti,driver-strength-ohm = <50>;
disable-wp;
};

&main_sdhci1 {
/* SD card */
status = "okay";
@@ -763,6 +790,32 @@
status = "okay";
};

&fss {
status = "okay";
};

&ospi0 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&mcu_fss0_ospi0_pins_default>;

flash@0 {
compatible = "jedec,spi-nor";
reg = <0x0>;
spi-tx-bus-width = <8>;
spi-rx-bus-width = <8>;
spi-max-frequency = <25000000>;
cdns,tshsl-ns = <60>;
cdns,tsd2d-ns = <60>;
cdns,tchsh-ns = <60>;
cdns,tslch-ns = <60>;
cdns,read-delay = <4>;
cdns,phy-mode;
#address-cells = <1>;
#size-cells = <1>;
};
};

&mailbox0_cluster0 {
status = "okay";
interrupts = <436>;
42 changes: 42 additions & 0 deletions arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi
Original file line number Diff line number Diff line change
@@ -314,6 +314,48 @@
};
};

fss: syscon@47000000 {
compatible = "syscon", "simple-mfd";
reg = <0x0 0x47000000 0x0 0x100>;
#address-cells = <2>;
#size-cells = <2>;
ranges;
status = "disabled";

ospi0: spi@47040000 {
compatible = "ti,am654-ospi", "cdns,qspi-nor";
reg = <0x00 0x47040000 0x00 0x100>,
<0x5 0x0000000 0x1 0x0000000>;
interrupts = <GIC_SPI 840 IRQ_TYPE_LEVEL_HIGH>;
cdns,fifo-depth = <256>;
cdns,fifo-width = <4>;
cdns,trigger-address = <0x0>;
clocks = <&k3_clks 161 7>;
assigned-clocks = <&k3_clks 161 7>;
assigned-clock-parents = <&k3_clks 161 9>;
assigned-clock-rates = <166666666>;
power-domains = <&k3_pds 161 TI_SCI_PD_EXCLUSIVE>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};

ospi1: spi@47050000 {
compatible = "ti,am654-ospi", "cdns,qspi-nor";
reg = <0x00 0x47050000 0x00 0x100>,
<0x7 0x0000000 0x1 0x0000000>;
interrupts = <GIC_SPI 841 IRQ_TYPE_LEVEL_HIGH>;
cdns,fifo-depth = <256>;
cdns,fifo-width = <4>;
cdns,trigger-address = <0x0>;
clocks = <&k3_clks 162 7>;
power-domains = <&k3_pds 162 TI_SCI_PD_EXCLUSIVE>;
#address-cells = <1>;
#size-cells = <0>;
status = "disabled";
};
};

mcu_r5fss0: r5fss@41000000 {
compatible = "ti,j721s2-r5fss";
ti,cluster-mode = <1>;
Loading