Samsung DTS ARM64 changes for v6.7

1. Exynos850: Add support for USB 2.0 (host and device) and enable it on
    E850-96 board.
 
 2. Exynos5433: Switch sound card to generic audio-routing property,
    supported since previous release for Samsung drivers.  The old
    samsung,audio-routing property is deprecated.
 
 3. Few cleanups.
 -----BEGIN PGP SIGNATURE-----
 
 iQJEBAABCgAuFiEE3dJiKD0RGyM7briowTdm5oaLg9cFAmUf1ZsQHGtyemtAa2Vy
 bmVsLm9yZwAKCRDBN2bmhouD16cgEACT59DACqrwXQuPdWADQAhVosa0U8tXtzxX
 yQR087zK5cIOmWABmHS1XiOXiStFyafSOhN0Mj9VETNQTOT0ZVUr2yBzR/dg6D5H
 ukL6Jhi1i7wX/9oSOaSbc7xAR/0BRSNPTyVACWVdplcRMrnSU/e2kx+69i5VpFJ/
 mKh6w9LZYLpp6zDCrFPcHu01oPMU9hpq8L/tZi8ZnIbMKrYz7BnhxP1bRjrGaxkl
 DjcEn/vpTC//2BOb66FnSy5KAJnTq96iH08xYwlmuTtYJrBamv2+8uQ9/XQbVAHh
 JOldkIplU+JFBcdywt2jF3gFdKwIUl1dFpfpujZJ8tPpVM5/JG7I6BfuTN97pe7E
 7aDdA4+9e1a+sLYtQQQZcF2BJRj7caFdI/FXEacAe500sD7uBB/rSFgFSp435BuH
 EXxXpIPrFIAjx5rc1kUaC520OVbAc9x3VsXwDKHxHOAUiLYySQ2TkMJVa6ChazIS
 8Iel4DtIs0sXaIqmjbBtuCwXi0TXMgvYh2RJf3YKdP3YJd26rIHGJOvD+Wd/b005
 hOE+Zxp2Eqh7XYNuBA3D7JURE1pxaPyqP68kN9v5jjEWSN2ypmhWY9/80CRd8XT4
 5I1RzD137vCxi84shyJ0Lht/Qg/6aIJbd0u7+8XF5u3SJffwQlRTlq8xTWeVFRai
 GboE8iLXqw==
 =06Ah
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmUn0QMACgkQYKtH/8kJ
 Uif4VRAA2+CQDQYNkHkvFUb0ehcYOCbQlwZQQmF9gZAlmna9EpK7qp3gfbijDh7E
 OzGgkgxUKUSMh5JpS+bTnd6eZ4cRhYup1AHWJgHmR6pxOSjcFV8lp9bz4UyjMj34
 H2kkCuafY5tLbJYPmtp+bUdmO4SGi7SigOhUqBh/BV/DTa4shAkDZB+kQkjVCd/V
 YSrvdb37Mlcd7cxS58xLS4cB5uE+fT92UOEd5XJvIEUX5e39ShqQcFiQ1oDiBKvH
 HFij7/iCRqZiq74tfke3J7kcB2DR0AOCZG0mQLdHvD83XaCZx2wioGce8raWsyA5
 m/qUjP40h5sqjxoXSp4NZ6trk/I5u23E79zbZ5OKJcmQmyUxsKqnrnPFvJNBbeT9
 kdYhQa1OrRxcmwX+qsNO0mV7+UmcUzuoFhbPGJVwefRW+2m4uQg0WqZsfc4Fc2Gj
 oi1JX1QVdUBSA3b9ATXb1j9AR0hoAP+jvclz2UO1voqZBgvMEUecMyaCzAGVg7O/
 iv29fAFsj/F6G4CMuPfHii+cyukbKYtob/+MRbpVpfr8o4vBWRX/jo2xYCF7zXGb
 aBBqTeiEju18OlEyFVDrlQz91FuQ0jMDjyZnR5Yy9hV/QxbtNcCXAb2r41m5dLCS
 pTOf+FJJVWsFK2B7GP82lOC0urwgANtjRPkyYTrGtrQmh546lLU=
 =i6z7
 -----END PGP SIGNATURE-----

Merge tag 'samsung-dt64-6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/dt

Samsung DTS ARM64 changes for v6.7

1. Exynos850: Add support for USB 2.0 (host and device) and enable it on
   E850-96 board.

2. Exynos5433: Switch sound card to generic audio-routing property,
   supported since previous release for Samsung drivers.  The old
   samsung,audio-routing property is deprecated.

3. Few cleanups.

* tag 'samsung-dt64-6.7' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  arm64: dts: exynos: remove unused TMU alias
  arm64: dts: exynos: Use pinctrl macros for exynos5433-tm2
  arm64: dts: exynos: exynos5433-tm2: switch sound card to audio-routing
  arm64: dts: exynos: Enable USB support on E850-96 board
  arm64: dts: exynos: Enable USB in Exynos850

Link: https://lore.kernel.org/r/20231006093943.106002-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-10-12 12:57:06 +02:00
commit 89ca0ec59f
4 changed files with 99 additions and 13 deletions

View File

@ -124,19 +124,18 @@
audio-amplifier = <&max98504>; audio-amplifier = <&max98504>;
mic-bias-gpios = <&gpr3 2 GPIO_ACTIVE_HIGH>; mic-bias-gpios = <&gpr3 2 GPIO_ACTIVE_HIGH>;
model = "wm5110"; model = "wm5110";
samsung,audio-routing = audio-routing = /* Headphone */
/* Headphone */ "HP", "HPOUT1L",
"HP", "HPOUT1L", "HP", "HPOUT1R",
"HP", "HPOUT1R",
/* Speaker */ /* Speaker */
"SPK", "SPKOUT", "SPK", "SPKOUT",
"SPKOUT", "HPOUT2L", "SPKOUT", "HPOUT2L",
"SPKOUT", "HPOUT2R", "SPKOUT", "HPOUT2R",
/* Receiver */ /* Receiver */
"RCV", "HPOUT3L", "RCV", "HPOUT3L",
"RCV", "HPOUT3R"; "RCV", "HPOUT3R";
}; };
}; };
@ -1103,7 +1102,7 @@
te_irq: te-irq-pins { te_irq: te-irq-pins {
samsung,pins = "gpf1-3"; samsung,pins = "gpf1-3";
samsung,pin-function = <0xf>; samsung,pin-function = <EXYNOS_PIN_FUNC_EINT>;
}; };
}; };

View File

@ -25,7 +25,6 @@
pinctrl6 = &pinctrl_fsys0; pinctrl6 = &pinctrl_fsys0;
pinctrl7 = &pinctrl_fsys1; pinctrl7 = &pinctrl_fsys1;
pinctrl8 = &pinctrl_bus1; pinctrl8 = &pinctrl_bus1;
tmuctrl0 = &tmuctrl_0;
}; };
arm-pmu { arm-pmu {

View File

@ -29,6 +29,22 @@
stdout-path = &serial_0; stdout-path = &serial_0;
}; };
connector {
compatible = "gpio-usb-b-connector", "usb-b-connector";
label = "micro-USB";
type = "micro";
vbus-supply = <&reg_usb_host_vbus>;
id-gpios = <&gpa0 0 GPIO_ACTIVE_LOW>;
pinctrl-names = "default";
pinctrl-0 = <&micro_usb_det_pins>;
port {
usb_dr_connector: endpoint {
remote-endpoint = <&usb1_drd_sw>;
};
};
};
/* /*
* RAM: 4 GiB (eMCP): * RAM: 4 GiB (eMCP):
* - 2 GiB at 0x80000000 * - 2 GiB at 0x80000000
@ -111,6 +127,20 @@
}; };
}; };
/* TODO: Remove this once PMIC is implemented */
reg_dummy: regulator-0 {
compatible = "regulator-fixed";
regulator-name = "dummy_reg";
};
reg_usb_host_vbus: regulator-1 {
compatible = "regulator-fixed";
regulator-name = "usb_host_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&gpa3 5 GPIO_ACTIVE_LOW>;
};
/* /*
* RTC clock (XrtcXTI); external, must be 32.768 kHz. * RTC clock (XrtcXTI); external, must be 32.768 kHz.
* *
@ -172,6 +202,12 @@
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>; samsung,pin-drv = <EXYNOS5420_PIN_DRV_LV1>;
}; };
micro_usb_det_pins: micro-usb-det-pins {
samsung,pins = "gpa0-0";
samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>;
samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
};
}; };
&rtc { &rtc {
@ -186,6 +222,28 @@
pinctrl-0 = <&uart1_pins>; pinctrl-0 = <&uart1_pins>;
}; };
&usbdrd {
status = "okay";
vdd10-supply = <&reg_dummy>;
vdd33-supply = <&reg_dummy>;
};
&usbdrd_dwc3 {
dr_mode = "otg";
usb-role-switch;
role-switch-default-mode = "host";
port {
usb1_drd_sw: endpoint {
remote-endpoint = <&usb_dr_connector>;
};
};
};
&usbdrd_phy {
status = "okay";
};
&usi_uart { &usi_uart {
samsung,clkreq-on; /* needed for UART mode */ samsung,clkreq-on; /* needed for UART mode */
status = "okay"; status = "okay";

View File

@ -570,6 +570,36 @@
clocks = <&cmu_cmgp CLK_GOUT_SYSREG_CMGP_PCLK>; clocks = <&cmu_cmgp CLK_GOUT_SYSREG_CMGP_PCLK>;
}; };
usbdrd: usb@13600000 {
compatible = "samsung,exynos850-dwusb3";
ranges = <0x0 0x13600000 0x10000>;
clocks = <&cmu_hsi CLK_GOUT_USB_BUS_EARLY_CLK>,
<&cmu_hsi CLK_GOUT_USB_REF_CLK>;
clock-names = "bus_early", "ref";
#address-cells = <1>;
#size-cells = <1>;
status = "disabled";
usbdrd_dwc3: usb@0 {
compatible = "snps,dwc3";
reg = <0x0 0x10000>;
interrupts = <GIC_SPI 137 IRQ_TYPE_LEVEL_HIGH>;
phys = <&usbdrd_phy 0>;
phy-names = "usb2-phy";
};
};
usbdrd_phy: phy@135d0000 {
compatible = "samsung,exynos850-usbdrd-phy";
reg = <0x135d0000 0x100>;
clocks = <&cmu_hsi CLK_GOUT_USB_PHY_ACLK>,
<&cmu_hsi CLK_GOUT_USB_PHY_REF_CLK>;
clock-names = "phy", "ref";
samsung,pmu-syscon = <&pmu_system_controller>;
#phy-cells = <1>;
status = "disabled";
};
usi_uart: usi@138200c0 { usi_uart: usi@138200c0 {
compatible = "samsung,exynos850-usi"; compatible = "samsung,exynos850-usi";
reg = <0x138200c0 0x20>; reg = <0x138200c0 0x20>;