Skip to content

Commit c36a19e

Browse files
committed
Merge tag 'samsung-dt64-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into soc/dt
Samsung DTS ARM64 changes for v6.10 1. Google GS101: Minor cleanup and add fake regulators to USB phy, to satisfy dtbs_check. The PMIC providing these regulators is not yet implemented. 2. Exynos850: Add True Random Number Generator. * tag 'samsung-dt64-6.11' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux: arm64: dts: exynos850: Enable TRNG arm64: dts: exynos: gs101-oriole: add placeholder regulators for USB phy arm64: dts: exynos: gs101: reorder properties as per guidelines Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents cdb3f6b + 64c7ea4 commit c36a19e

File tree

3 files changed

+27
-12
lines changed

3 files changed

+27
-12
lines changed

arch/arm64/boot/dts/exynos/exynos850.dtsi

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -416,6 +416,14 @@
416416
interrupts = <GIC_SPI 451 IRQ_TYPE_LEVEL_HIGH>;
417417
};
418418

419+
trng: rng@12081400 {
420+
compatible = "samsung,exynos850-trng";
421+
reg = <0x12081400 0x100>;
422+
clocks = <&cmu_core CLK_GOUT_SSS_ACLK>,
423+
<&cmu_core CLK_GOUT_SSS_PCLK>;
424+
clock-names = "secss", "pclk";
425+
};
426+
419427
pinctrl_hsi: pinctrl@13430000 {
420428
compatible = "samsung,exynos850-pinctrl";
421429
reg = <0x13430000 0x1000>;

arch/arm64/boot/dts/exynos/google/gs101-oriole.dts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,9 +131,9 @@
131131
};
132132

133133
&usbdrd31 {
134-
status = "okay";
135134
vdd10-supply = <&reg_placeholder>;
136135
vdd33-supply = <&reg_placeholder>;
136+
status = "okay";
137137
};
138138

139139
&usbdrd31_dwc3 {
@@ -145,6 +145,13 @@
145145
};
146146

147147
&usbdrd31_phy {
148+
/* TODO: Update these once PMIC is implemented */
149+
pll-supply = <&reg_placeholder>;
150+
dvdd-usb20-supply = <&reg_placeholder>;
151+
vddh-usb20-supply = <&reg_placeholder>;
152+
vdd33-usb20-supply = <&reg_placeholder>;
153+
vdda-usbdp-supply = <&reg_placeholder>;
154+
vddh-usbdp-supply = <&reg_placeholder>;
148155
status = "okay";
149156
};
150157

arch/arm64/boot/dts/exynos/google/gs101.dtsi

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -213,9 +213,9 @@
213213

214214
pmu-3 {
215215
compatible = "arm,dsu-pmu";
216-
interrupts = <GIC_SPI 257 IRQ_TYPE_LEVEL_HIGH 0>;
217216
cpus = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>,
218217
<&cpu4>, <&cpu5>, <&cpu6>, <&cpu7>;
218+
interrupts = <GIC_SPI 257 IRQ_TYPE_LEVEL_HIGH 0>;
219219
};
220220

221221
psci {
@@ -288,6 +288,8 @@
288288
compatible = "google,gs101-mct",
289289
"samsung,exynos4210-mct";
290290
reg = <0x10050000 0x800>;
291+
clocks = <&ext_24_5m>, <&cmu_misc CLK_GOUT_MISC_MCT_PCLK>;
292+
clock-names = "fin_pll", "mct";
291293
interrupts = <GIC_SPI 753 IRQ_TYPE_LEVEL_HIGH 0>,
292294
<GIC_SPI 754 IRQ_TYPE_LEVEL_HIGH 0>,
293295
<GIC_SPI 755 IRQ_TYPE_LEVEL_HIGH 0>,
@@ -300,17 +302,15 @@
300302
<GIC_SPI 762 IRQ_TYPE_LEVEL_HIGH 0>,
301303
<GIC_SPI 763 IRQ_TYPE_LEVEL_HIGH 0>,
302304
<GIC_SPI 764 IRQ_TYPE_LEVEL_HIGH 0>;
303-
clocks = <&ext_24_5m>, <&cmu_misc CLK_GOUT_MISC_MCT_PCLK>;
304-
clock-names = "fin_pll", "mct";
305305
};
306306

307307
watchdog_cl0: watchdog@10060000 {
308308
compatible = "google,gs101-wdt";
309309
reg = <0x10060000 0x100>;
310-
interrupts = <GIC_SPI 765 IRQ_TYPE_LEVEL_HIGH 0>;
311310
clocks = <&cmu_misc CLK_GOUT_MISC_WDT_CLUSTER0_PCLK>,
312311
<&ext_24_5m>;
313312
clock-names = "watchdog", "watchdog_src";
313+
interrupts = <GIC_SPI 765 IRQ_TYPE_LEVEL_HIGH 0>;
314314
samsung,syscon-phandle = <&pmu_system_controller>;
315315
samsung,cluster-index = <0>;
316316
status = "disabled";
@@ -319,10 +319,10 @@
319319
watchdog_cl1: watchdog@10070000 {
320320
compatible = "google,gs101-wdt";
321321
reg = <0x10070000 0x100>;
322-
interrupts = <GIC_SPI 766 IRQ_TYPE_LEVEL_HIGH 0>;
323322
clocks = <&cmu_misc CLK_GOUT_MISC_WDT_CLUSTER1_PCLK>,
324323
<&ext_24_5m>;
325324
clock-names = "watchdog", "watchdog_src";
325+
interrupts = <GIC_SPI 766 IRQ_TYPE_LEVEL_HIGH 0>;
326326
samsung,syscon-phandle = <&pmu_system_controller>;
327327
samsung,cluster-index = <1>;
328328
status = "disabled";
@@ -776,12 +776,12 @@
776776
compatible = "google,gs101-hsi2c",
777777
"samsung,exynosautov9-hsi2c";
778778
reg = <0x10970000 0xc0>;
779-
interrupts = <GIC_SPI 642 IRQ_TYPE_LEVEL_HIGH 0>;
780779
#address-cells = <1>;
781780
#size-cells = <0>;
782781
clocks = <&cmu_peric0 CLK_GOUT_PERIC0_PERIC0_TOP0_IPCLK_7>,
783782
<&cmu_peric0 CLK_GOUT_PERIC0_PERIC0_TOP0_PCLK_7>;
784783
clock-names = "hsi2c", "hsi2c_pclk";
784+
interrupts = <GIC_SPI 642 IRQ_TYPE_LEVEL_HIGH 0>;
785785
pinctrl-0 = <&hsi2c8_bus>;
786786
pinctrl-names = "default";
787787
status = "disabled";
@@ -831,10 +831,10 @@
831831
serial_0: serial@10a00000 {
832832
compatible = "google,gs101-uart";
833833
reg = <0x10a00000 0xc0>;
834-
interrupts = <GIC_SPI 634 IRQ_TYPE_LEVEL_HIGH 0>;
835834
clocks = <&cmu_peric0 CLK_GOUT_PERIC0_PERIC0_TOP1_PCLK_0>,
836835
<&cmu_peric0 CLK_GOUT_PERIC0_PERIC0_TOP1_IPCLK_0>;
837836
clock-names = "uart", "clk_uart_baud0";
837+
interrupts = <GIC_SPI 634 IRQ_TYPE_LEVEL_HIGH 0>;
838838
pinctrl-0 = <&uart0_bus>;
839839
pinctrl-names = "default";
840840
samsung,uart-fifosize = <256>;
@@ -1157,12 +1157,12 @@
11571157
compatible = "google,gs101-hsi2c",
11581158
"samsung,exynosautov9-hsi2c";
11591159
reg = <0x10d50000 0xc0>;
1160-
interrupts = <GIC_SPI 655 IRQ_TYPE_LEVEL_HIGH 0>;
11611160
#address-cells = <1>;
11621161
#size-cells = <0>;
11631162
clocks = <&cmu_peric1 CLK_GOUT_PERIC1_PERIC1_TOP0_IPCLK_5>,
11641163
<&cmu_peric1 CLK_GOUT_PERIC1_PERIC1_TOP0_PCLK_5>;
11651164
clock-names = "hsi2c", "hsi2c_pclk";
1165+
interrupts = <GIC_SPI 655 IRQ_TYPE_LEVEL_HIGH 0>;
11661166
pinctrl-0 = <&hsi2c12_bus>;
11671167
pinctrl-names = "default";
11681168
status = "disabled";
@@ -1277,28 +1277,28 @@
12771277
<&cmu_hsi0 CLK_GOUT_HSI0_UASC_HSI0_CTRL_PCLK>,
12781278
<&cmu_hsi0 CLK_GOUT_HSI0_USB31DRD_I_USBDPPHY_SCL_APB_PCLK>;
12791279
clock-names = "phy", "ref", "ctrl_aclk", "ctrl_pclk", "scl_pclk";
1280-
samsung,pmu-syscon = <&pmu_system_controller>;
12811280
#phy-cells = <1>;
1281+
samsung,pmu-syscon = <&pmu_system_controller>;
12821282
status = "disabled";
12831283
};
12841284

12851285
usbdrd31: usb@11110000 {
12861286
compatible = "google,gs101-dwusb3";
1287+
ranges = <0x0 0x11110000 0x10000>;
12871288
clocks = <&cmu_hsi0 CLK_GOUT_HSI0_USB31DRD_BUS_CLK_EARLY>,
12881289
<&cmu_hsi0 CLK_GOUT_HSI0_USB31DRD_I_USB31DRD_SUSPEND_CLK_26>,
12891290
<&cmu_hsi0 CLK_GOUT_HSI0_UASC_HSI0_LINK_ACLK>,
12901291
<&cmu_hsi0 CLK_GOUT_HSI0_UASC_HSI0_LINK_PCLK>;
12911292
clock-names = "bus_early", "susp_clk", "link_aclk", "link_pclk";
12921293
#address-cells = <1>;
12931294
#size-cells = <1>;
1294-
ranges = <0x0 0x11110000 0x10000>;
12951295
status = "disabled";
12961296

12971297
usbdrd31_dwc3: usb@0 {
12981298
compatible = "snps,dwc3";
1299+
reg = <0x0 0x10000>;
12991300
clocks = <&cmu_hsi0 CLK_GOUT_HSI0_USB31DRD_I_USB31DRD_REF_CLK_40>;
13001301
clock-names = "ref";
1301-
reg = <0x0 0x10000>;
13021302
interrupts = <GIC_SPI 463 IRQ_TYPE_LEVEL_HIGH 0>;
13031303
phys = <&usbdrd31_phy 0>, <&usbdrd31_phy 1>;
13041304
phy-names = "usb2-phy", "usb3-phy";

0 commit comments

Comments
 (0)