Commit 08caced4 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'samsung-dt64-6.6' of...

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

Samsung DTS ARM64 changes for v6.6

1. Add dedicated compatibles for PWM block.
2. Add PWM to ExynosAutov9 SADK board.
3. Few white-space and other cleanups.

* tag 'samsung-dt64-6.6' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  arm64: dts: exynos: exynos5433-tm2: drop redundant status=okay
  arm64: dts: exynos: add pwm node for exynosautov9-sadk
  dt-bindings: pwm: samsung: add exynosautov9 compatible
  arm64: dts: fsd: minor whitespace cleanup around '='
  arm64: dts: exynos: minor whitespace cleanup around '='
  arm64: dts: exynos: add missing space before {

Link: https://lore.kernel.org/r/20230810151250.220202-2-krzysztof.kozlowski@linaro.orgSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 083f1015 d157d437
...@@ -20,12 +20,17 @@ description: |+ ...@@ -20,12 +20,17 @@ description: |+
properties: properties:
compatible: compatible:
enum: oneOf:
- samsung,s3c2410-pwm # 16-bit, S3C24xx - enum:
- samsung,s3c6400-pwm # 32-bit, S3C64xx - samsung,s3c2410-pwm # 16-bit, S3C24xx
- samsung,s5p6440-pwm # 32-bit, S5P64x0 - samsung,s3c6400-pwm # 32-bit, S3C64xx
- samsung,s5pc100-pwm # 32-bit, S5PC100, S5PV210, Exynos4210 rev0 SoCs - samsung,s5p6440-pwm # 32-bit, S5P64x0
- samsung,exynos4210-pwm # 32-bit, Exynos - samsung,s5pc100-pwm # 32-bit, S5PC100, S5PV210, Exynos4210 rev0 SoCs
- samsung,exynos4210-pwm # 32-bit, Exynos
- items:
- enum:
- samsung,exynosautov9-pwm
- const: samsung,exynos4210-pwm
reg: reg:
maxItems: 1 maxItems: 1
......
...@@ -137,7 +137,6 @@ sound { ...@@ -137,7 +137,6 @@ sound {
/* Receiver */ /* Receiver */
"RCV", "HPOUT3L", "RCV", "HPOUT3L",
"RCV", "HPOUT3R"; "RCV", "HPOUT3R";
status = "okay";
}; };
}; };
......
...@@ -138,10 +138,10 @@ gic: interrupt-controller@11001000 { ...@@ -138,10 +138,10 @@ gic: interrupt-controller@11001000 {
#interrupt-cells = <3>; #interrupt-cells = <3>;
#address-cells = <0>; #address-cells = <0>;
interrupt-controller; interrupt-controller;
reg = <0x11001000 0x1000>, reg = <0x11001000 0x1000>,
<0x11002000 0x2000>, <0x11002000 0x2000>,
<0x11004000 0x2000>, <0x11004000 0x2000>,
<0x11006000 0x2000>; <0x11006000 0x2000>;
}; };
pdma0: dma-controller@10e10000 { pdma0: dma-controller@10e10000 {
......
...@@ -49,6 +49,12 @@ ufs_1_fixed_vcc_reg: regulator-1 { ...@@ -49,6 +49,12 @@ ufs_1_fixed_vcc_reg: regulator-1 {
}; };
}; };
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm_tout3>;
status = "okay";
};
&serial_0 { &serial_0 {
pinctrl-0 = <&uart0_bus_dual>; pinctrl-0 = <&uart0_bus_dual>;
status = "okay"; status = "okay";
......
...@@ -313,7 +313,7 @@ wakeup-interrupt-controller { ...@@ -313,7 +313,7 @@ wakeup-interrupt-controller {
}; };
}; };
pinctrl_aud: pinctrl@19c60000{ pinctrl_aud: pinctrl@19c60000 {
compatible = "samsung,exynosautov9-pinctrl"; compatible = "samsung,exynosautov9-pinctrl";
reg = <0x19c60000 0x1000>; reg = <0x19c60000 0x1000>;
}; };
...@@ -1560,6 +1560,17 @@ watchdog_cl1: watchdog@10060000 { ...@@ -1560,6 +1560,17 @@ watchdog_cl1: watchdog@10060000 {
samsung,syscon-phandle = <&pmu_system_controller>; samsung,syscon-phandle = <&pmu_system_controller>;
samsung,cluster-index = <1>; samsung,cluster-index = <1>;
}; };
pwm: pwm@103f0000 {
compatible = "samsung,exynosautov9-pwm",
"samsung,exynos4210-pwm";
reg = <0x103f0000 0x100>;
samsung,pwm-outputs = <0>, <1>, <2>, <3>;
#pwm-cells = <3>;
clocks = <&xtcxo>;
clock-names = "timers";
status = "disabled";
};
}; };
}; };
......
...@@ -353,8 +353,8 @@ gic: interrupt-controller@10400000 { ...@@ -353,8 +353,8 @@ gic: interrupt-controller@10400000 {
compatible = "arm,gic-v3"; compatible = "arm,gic-v3";
#interrupt-cells = <3>; #interrupt-cells = <3>;
interrupt-controller; interrupt-controller;
reg = <0x0 0x10400000 0x0 0x10000>, /* GICD */ reg = <0x0 0x10400000 0x0 0x10000>, /* GICD */
<0x0 0x10600000 0x0 0x200000>; /* GICR_RD+GICR_SGI */ <0x0 0x10600000 0x0 0x200000>; /* GICR_RD+GICR_SGI */
interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>;
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment