Skip to content

Commit 8619793

Browse files
zampierilucaszampierilucas
committed
Merge: Pull in support for TI j784s4-evm's DISPLAY_PORT0
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/4294 JIRA: https://issues.redhat.com/browse/RHEL-35606 Omitted-fix: 408e42a ("drm/fb-helper: Fix missing kerneldoc include") Omitted-fix: 395d10a ("drm/xlnx: Fix build failure due to missing include") Omitted-fix: 9c65ab7 ("drm: fsl-dcu: select CONFIG_DRM_GEM_CMA_HELPER") Omitted-fix: cb18527 ("drm/arm: arm hdlcd select DRM_GEM_CMA_HELPER") Omitted-fix: ff52fe0 ("drm/imx: Kconfig: Remove duplicated 'select DRM_KMS_HELPER' line") the patch(es) these fix only took the TI bits in this MR, so they're not relevant. Omitted-fix: 3d58538 ("arm64: dts: ti: k3-j721e: Fix mux-reg-masks in hbmc_mux") this platform isn't supported. revumatic recommends bringing in 95d4b47 ("drm/tidss: Fix atomic_flush check"), but the commit was already applied in RHEL's 3093109 ("drm/tidss: Fix atomic_flush check)". This gets the necessary drivers in shape to build and run fine on the platform. Enablement of the actual configs is done in the main-automotive branch via https://issues.redhat.com/browse/RHEL-38209. Signed-off-by: Andrew Halaney <ahalaney@redhat.com> Approved-by: Mark Langsdorf <mlangsdo@redhat.com> Approved-by: Desnes Nunes <desnesn@redhat.com> Approved-by: Brian Masney <bmasney@redhat.com> Approved-by: Jocelyn Falempe <jfalempe@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Lucas Zampieri <lzampier@redhat.com>
2 parents 2a3757c + 99052dd commit 8619793

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+3670
-2404
lines changed

‎Documentation/devicetree/bindings/phy/phy-cadence-torrent.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ examples:
202202
#phy-cells = <0>;
203203
cdns,phy-type = <PHY_TYPE_PCIE>;
204204
cdns,num-lanes = <2>;
205-
cdns,ssc-mode = <TORRENT_SERDES_NO_SSC>;
205+
cdns,ssc-mode = <CDNS_SERDES_NO_SSC>;
206206
};
207207
208208
phy@2 {
@@ -211,7 +211,7 @@ examples:
211211
#phy-cells = <0>;
212212
cdns,phy-type = <PHY_TYPE_SGMII>;
213213
cdns,num-lanes = <1>;
214-
cdns,ssc-mode = <TORRENT_SERDES_NO_SSC>;
214+
cdns,ssc-mode = <CDNS_SERDES_NO_SSC>;
215215
};
216216
};
217217
};

‎arch/arm/mach-davinci/board-da850-evm.c‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -519,8 +519,8 @@ static int da850_evm_ui_expander_setup(struct i2c_client *client, unsigned gpio,
519519
return ret;
520520
}
521521

522-
static int da850_evm_ui_expander_teardown(struct i2c_client *client,
523-
unsigned gpio, unsigned ngpio, void *c)
522+
static void da850_evm_ui_expander_teardown(struct i2c_client *client,
523+
unsigned gpio, unsigned ngpio, void *c)
524524
{
525525
platform_device_unregister(&da850_evm_ui_keys_device);
526526

@@ -532,8 +532,6 @@ static int da850_evm_ui_expander_teardown(struct i2c_client *client,
532532
gpio_free(gpio + DA850_EVM_UI_EXP_SEL_C);
533533
gpio_free(gpio + DA850_EVM_UI_EXP_SEL_B);
534534
gpio_free(gpio + DA850_EVM_UI_EXP_SEL_A);
535-
536-
return 0;
537535
}
538536

539537
/* assign the baseboard expander's GPIOs after the UI board's */
@@ -700,13 +698,11 @@ static int da850_evm_bb_expander_setup(struct i2c_client *client,
700698
return ret;
701699
}
702700

703-
static int da850_evm_bb_expander_teardown(struct i2c_client *client,
704-
unsigned gpio, unsigned ngpio, void *c)
701+
static void da850_evm_bb_expander_teardown(struct i2c_client *client,
702+
unsigned gpio, unsigned ngpio, void *c)
705703
{
706704
platform_device_unregister(&da850_evm_bb_leds_device);
707705
platform_device_unregister(&da850_evm_bb_keys_device);
708-
709-
return 0;
710706
}
711707

712708
static struct pca953x_platform_data da850_evm_ui_expander_info = {

‎arch/arm64/boot/dts/ti/k3-am69-sk.dts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// SPDX-License-Identifier: GPL-2.0
1+
// SPDX-License-Identifier: GPL-2.0-only OR MIT
22
/*
3-
* Copyright (C) 2022-2023 Texas Instruments Incorporated - https://www.ti.com/
3+
* Copyright (C) 2022-2024 Texas Instruments Incorporated - https://www.ti.com/
44
*
55
* Design Files: https://www.ti.com/lit/zip/SPRR466
66
* TRM: https://www.ti.com/lit/zip/spruj52
@@ -33,6 +33,7 @@
3333

3434
memory@80000000 {
3535
device_type = "memory";
36+
bootph-all;
3637
/* 32G RAM */
3738
reg = <0x00 0x80000000 0x00 0x80000000>,
3839
<0x08 0x80000000 0x07 0x80000000>;

‎arch/arm64/boot/dts/ti/k3-j784s4-evm.dts‎

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// SPDX-License-Identifier: GPL-2.0
1+
// SPDX-License-Identifier: GPL-2.0-only OR MIT
22
/*
3-
* Copyright (C) 2022 Texas Instruments Incorporated - https://www.ti.com/
3+
* Copyright (C) 2022-2024 Texas Instruments Incorporated - https://www.ti.com/
44
*
55
* EVM Board Schematics: https://www.ti.com/lit/zip/sprr458
66
*/
@@ -31,6 +31,7 @@
3131

3232
memory@80000000 {
3333
device_type = "memory";
34+
bootph-all;
3435
/* 32G RAM */
3536
reg = <0x00 0x80000000 0x00 0x80000000>,
3637
<0x08 0x80000000 0x07 0x80000000>;
@@ -296,6 +297,13 @@
296297
>;
297298
};
298299

300+
main_i2c5_pins_default: main-i2c5-default-pins {
301+
pinctrl-single,pins = <
302+
J784S4_IOPAD(0x01c, PIN_INPUT, 8) /* (AG34) MCAN15_TX.I2C5_SCL */
303+
J784S4_IOPAD(0x018, PIN_INPUT, 8) /* (AK36) MCAN14_RX.I2C5_SDA */
304+
>;
305+
};
306+
299307
main_mmc1_pins_default: main-mmc1-default-pins {
300308
bootph-all;
301309
pinctrl-single,pins = <
@@ -335,16 +343,16 @@
335343
wkup_uart0_pins_default: wkup-uart0-default-pins {
336344
bootph-all;
337345
pinctrl-single,pins = <
338-
J721S2_WKUP_IOPAD(0x048, PIN_INPUT, 0) /* (K35) WKUP_UART0_RXD */
339-
J721S2_WKUP_IOPAD(0x04c, PIN_INPUT, 0) /* (K34) WKUP_UART0_TXD */
346+
J784S4_WKUP_IOPAD(0x048, PIN_INPUT, 0) /* (K35) WKUP_UART0_RXD */
347+
J784S4_WKUP_IOPAD(0x04c, PIN_OUTPUT, 0) /* (K34) WKUP_UART0_TXD */
340348
>;
341349
};
342350

343351
wkup_i2c0_pins_default: wkup-i2c0-default-pins {
344352
bootph-all;
345353
pinctrl-single,pins = <
346-
J721S2_WKUP_IOPAD(0x98, PIN_INPUT, 0) /* (N33) WKUP_I2C0_SCL */
347-
J721S2_WKUP_IOPAD(0x9c, PIN_INPUT, 0) /* (N35) WKUP_I2C0_SDA */
354+
J784S4_WKUP_IOPAD(0x98, PIN_INPUT, 0) /* (N33) WKUP_I2C0_SCL */
355+
J784S4_WKUP_IOPAD(0x9c, PIN_INPUT, 0) /* (N35) WKUP_I2C0_SDA */
348356
>;
349357
};
350358

@@ -758,6 +766,24 @@
758766
};
759767
};
760768

769+
&main_i2c5 {
770+
pinctrl-names = "default";
771+
pinctrl-0 = <&main_i2c5_pins_default>;
772+
clock-frequency = <400000>;
773+
status = "okay";
774+
775+
exp5: gpio@20 {
776+
compatible = "ti,tca6408";
777+
reg = <0x20>;
778+
gpio-controller;
779+
#gpio-cells = <2>;
780+
gpio-line-names = "CSI2_EXP_RSTZ", "CSI2_EXP_A_GPIO0",
781+
"CSI2_EXP_A_GPIO1", "CSI2_EXP_A_GPIO3",
782+
"CSI2_EXP_B_GPIO1", "CSI2_EXP_B_GPIO2",
783+
"CSI2_EXP_B_GPIO3", "CSI2_EXP_B_GPIO4";
784+
};
785+
};
786+
761787
&main_sdhci0 {
762788
bootph-all;
763789
/* eMMC */

0 commit comments

Comments
 (0)