mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-03 07:36:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Samsung DTS ARM64 changes for v6.3, part two

Big cleanup and rework towards achieving zero-warning of dtbs_check and
dtc W=1:
 - drop or correct incorrect properties in several boards,
 - add dummy regulator supplies when necessary to fullfil bindings
   requirements,
 - use lowercase hex,
 - move non-MMIO exynos-bus nodes out of soc node,
 - add unit address to USB DWC3 nodes.

* tag 'samsung-dt64-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  arm64: dts: exynos: add unit address to DWC3 node wrapper in Exynos7
  arm64: dts: exynos: add unit address to DWC3 node wrapper in Exynos5433
  arm64: dts: exynos: move exynos-bus nodes out of soc in Exynos5433
  arm64: dts: exynos: use lowercase hex addresses
  arm64: dts: exynos: correct wlf,micd-dbtime on TM2
  arm64: dts: exynos: add interrupt-controller to WM5110 on TM2
  arm64: dts: exynos: add VPH_PWR regulator on TM2
  arm64: dts: exynos: correct Bluetooth LED triger on E850-96
  arm64: dts: exynos: add ADC supply on Exynos7 Espresso
  arm64: dts: exynos: disable non-working GPU on Exynos7 Espresso
  arm64: dts: exynos: drop unsupported UFS properties in ExynosAutov9 SADK

Link: https://lore.kernel.org/r/20230129143944.5104-2-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2023-01-30 22:58:28 +01:00
parent 00ef63ec1c 28dd277e54
commit 5868fc77e2
7 changed files with 39 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/boot/dts/exynos/exynos5433-bus.dtsi
View File

@@ -6,7 +6,7 @@
* Chanwoo Choi <cw00.choi@samsung.com>
*/
&soc {
/ {
bus_g2d_400: bus0 {
compatible = "samsung,exynos-bus";
clocks = <&cmu_top CLK_ACLK_G2D_400>;

17
arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi
View File

@@ -99,11 +99,18 @@ max98504: amplifier@31 {
DIOVDD-supply = <&ldo3_reg>;
DVDD-supply = <&ldo3_reg>;
/* PVDD-supply to VPH_PWR */
PVDD-supply = <&vph_pwr_regulator>;
};
};
irda_regulator: irda-regulator {
vph_pwr_regulator: regulator-vph-pwr {
compatible = "regulator-fixed";
regulator-name = "VPH_PWR";
regulator-min-microvolt = <4200000>;
regulator-max-microvolt = <4200000>;
};
irda_regulator: regulator-irda {
compatible = "regulator-fixed";
enable-active-high;
gpio = <&gpr3 3 GPIO_ACTIVE_HIGH>;
@@ -1278,11 +1285,13 @@ wm5110: audio-codec@0 {
gpio-controller;
#gpio-cells = <2>;
interrupt-controller;
#interrupt-cells = <2>;
wlf,micd-detect-debounce = <300>;
wlf,micd-bias-start-time = <0x1>;
wlf,micd-rate = <0x7>;
wlf,micd-dbtime = <0x1>;
wlf,micd-dbtime = <0x2>;
wlf,micd-force-micbias;
wlf,micd-configs = <0x0 1 0>;
wlf,hpdet-channel = <1>;
@@ -1298,6 +1307,8 @@ wm5110: audio-codec@0 {
CPVDD-supply = <&ldo18_reg>;
DBVDD2-supply = <&ldo18_reg>;
DBVDD3-supply = <&ldo18_reg>;
SPKVDDL-supply = <&vph_pwr_regulator>;
SPKVDDR-supply = <&vph_pwr_regulator>;
controller-data {
samsung,spi-feedback-delay = <0>;

28
arch/arm64/boot/dts/exynos/exynos5433.dtsi
View File

@@ -351,7 +351,7 @@ psci {
compatible = "arm,psci";
method = "smc";
cpu_off = <0x84000002>;
cpu_on = <0xC4000003>;
cpu_on = <0xc4000003>;
};
soc: soc@0 {
@@ -1020,7 +1020,7 @@ decon_tv: decon@13880000 {
dsi: dsi@13900000 {
compatible = "samsung,exynos5433-mipi-dsi";
reg = <0x13900000 0xC0>;
reg = <0x13900000 0xc0>;
interrupts = <GIC_SPI 205 IRQ_TYPE_LEVEL_HIGH>;
phys = <&mipi_phy 1>;
phy-names = "dsim";
@@ -1272,7 +1272,7 @@ jpeg: codec@15020000 {
mfc: codec@152e0000 {
compatible = "samsung,exynos5433-mfc";
reg = <0x152E0000 0x10000>;
reg = <0x152e0000 0x10000>;
interrupts = <GIC_SPI 358 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "pclk", "aclk", "aclk_xiu";
clocks = <&cmu_mfc CLK_PCLK_MFC>,
@@ -1329,7 +1329,7 @@ sysmmu_tv1x: sysmmu@13a30000 {
sysmmu_gscl0: sysmmu@13c80000 {
compatible = "samsung,exynos-sysmmu";
reg = <0x13C80000 0x1000>;
reg = <0x13c80000 0x1000>;
interrupts = <GIC_SPI 288 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "aclk", "pclk";
clocks = <&cmu_gscl CLK_ACLK_SMMU_GSCL0>,
@@ -1340,7 +1340,7 @@ sysmmu_gscl0: sysmmu@13c80000 {
sysmmu_gscl1: sysmmu@13c90000 {
compatible = "samsung,exynos-sysmmu";
reg = <0x13C90000 0x1000>;
reg = <0x13c90000 0x1000>;
interrupts = <GIC_SPI 290 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "aclk", "pclk";
clocks = <&cmu_gscl CLK_ACLK_SMMU_GSCL1>,
@@ -1351,7 +1351,7 @@ sysmmu_gscl1: sysmmu@13c90000 {
sysmmu_gscl2: sysmmu@13ca0000 {
compatible = "samsung,exynos-sysmmu";
reg = <0x13CA0000 0x1000>;
reg = <0x13ca0000 0x1000>;
interrupts = <GIC_SPI 292 IRQ_TYPE_LEVEL_HIGH>;
clock-names = "aclk", "pclk";
clocks = <&cmu_gscl CLK_ACLK_SMMU_GSCL2>,
@@ -1742,7 +1742,7 @@ hsi2c_11: i2c@14df0000 {
status = "disabled";
};
usbdrd30: usbdrd {
usbdrd30: usb@15400000 {
compatible = "samsung,exynos5433-dwusb3";
clocks = <&cmu_fsys CLK_ACLK_USBDRD30>,
<&cmu_fsys CLK_SCLK_USBDRD30>,
@@ -1751,16 +1751,16 @@ usbdrd30: usbdrd {
clock-names = "aclk", "susp_clk", "phyclk", "pipe_pclk";
#address-cells = <1>;
#size-cells = <1>;
ranges;
ranges = <0x0 0x15400000 0x10000>;
status = "disabled";
usbdrd_dwc3: usb@15400000 {
usbdrd_dwc3: usb@0 {
compatible = "snps,dwc3";
clocks = <&cmu_fsys CLK_SCLK_USBDRD30>,
<&cmu_fsys CLK_ACLK_USBDRD30>,
<&cmu_fsys CLK_SCLK_USBDRD30>;
clock-names = "ref", "bus_early", "suspend";
reg = <0x15400000 0x10000>;
reg = <0x0 0x10000>;
interrupts = <GIC_SPI 231 IRQ_TYPE_LEVEL_HIGH>;
phys = <&usbdrd30_phy 0>, <&usbdrd30_phy 1>;
phy-names = "usb2-phy", "usb3-phy";
@@ -1795,7 +1795,7 @@ usbhost30_phy: phy@15580000 {
status = "disabled";
};
usbhost30: usbhost {
usbhost30: usb@15a00000 {
compatible = "samsung,exynos5433-dwusb3";
clocks = <&cmu_fsys CLK_ACLK_USBHOST30>,
<&cmu_fsys CLK_SCLK_USBHOST30>,
@@ -1804,16 +1804,16 @@ usbhost30: usbhost {
clock-names = "aclk", "susp_clk", "phyclk", "pipe_pclk";
#address-cells = <1>;
#size-cells = <1>;
ranges;
ranges = <0x0 0x15a00000 0x10000>;
status = "disabled";
usbhost_dwc3: usb@15a00000 {
usbhost_dwc3: usb@0 {
compatible = "snps,dwc3";
clocks = <&cmu_fsys CLK_SCLK_USBHOST30>,
<&cmu_fsys CLK_ACLK_USBHOST30>,
<&cmu_fsys CLK_SCLK_USBHOST30>;
clock-names = "ref", "bus_early", "suspend";
reg = <0x15a00000 0x10000>;
reg = <0x0 0x10000>;
interrupts = <GIC_SPI 244 IRQ_TYPE_LEVEL_HIGH>;
phys = <&usbhost30_phy 0>, <&usbhost30_phy 1>;
phy-names = "usb2-phy", "usb3-phy";

4
arch/arm64/boot/dts/exynos/exynos7-espresso.dts
View File

@@ -28,7 +28,7 @@ chosen {
memory@40000000 {
device_type = "memory";
reg = <0x0 0x40000000 0x0 0xC0000000>;
reg = <0x0 0x40000000 0x0 0xc0000000>;
};
usb30_vbus_reg: regulator-usb30 {
@@ -61,7 +61,6 @@ &fin_pll {
&gpu {
mali-supply = <&buck6_reg>;
status = "okay";
};
&serial_2 {
@@ -79,6 +78,7 @@ &watchdog {
};
&adc {
vdd-supply = <&ldo3_reg>;
status = "okay";
};

14
arch/arm64/boot/dts/exynos/exynos7.dtsi
View File

@@ -119,7 +119,7 @@ psci {
compatible = "arm,psci";
method = "smc";
cpu_off = <0x84000002>;
cpu_on = <0xC4000003>;
cpu_on = <0xc4000003>;
};
soc: soc@0 {
@@ -146,7 +146,7 @@ gic: interrupt-controller@11001000 {
pdma0: dma-controller@10e10000 {
compatible = "arm,pl330", "arm,primecell";
reg = <0x10E10000 0x1000>;
reg = <0x10e10000 0x1000>;
interrupts = <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clock_fsys0 ACLK_PDMA0>;
clock-names = "apb_pclk";
@@ -155,7 +155,7 @@ pdma0: dma-controller@10e10000 {
pdma1: dma-controller@10eb0000 {
compatible = "arm,pl330", "arm,primecell";
reg = <0x10EB0000 0x1000>;
reg = <0x10eb0000 0x1000>;
interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clock_fsys0 ACLK_PDMA1>;
clock-names = "apb_pclk";
@@ -690,7 +690,7 @@ usbdrd_phy: phy@15500000 {
#phy-cells = <1>;
};
usbdrd: usb {
usbdrd: usb@15400000 {
compatible = "samsung,exynos7-dwusb3";
clocks = <&clock_fsys0 ACLK_USBDRD300>,
<&clock_fsys0 SCLK_USBDRD300_SUSPENDCLK>,
@@ -699,11 +699,11 @@ usbdrd: usb {
"usbdrd30_axius_clk";
#address-cells = <1>;
#size-cells = <1>;
ranges;
ranges = <0x0 0x15400000 0x10000>;
usb@15400000 {
usb@0 {
compatible = "snps,dwc3";
reg = <0x15400000 0x10000>;
reg = <0x0 0x10000>;
interrupts = <GIC_SPI 223 IRQ_TYPE_LEVEL_HIGH>;
phys = <&usbdrd_phy 0>, <&usbdrd_phy 1>;
phy-names = "usb2-phy", "usb3-phy";

2
arch/arm64/boot/dts/exynos/exynos850-e850-96.dts
View File

@@ -106,7 +106,7 @@ bt_active_led: led-5 {
gpios = <&gpg2 7 GPIO_ACTIVE_HIGH>;
color = <LED_COLOR_ID_BLUE>;
function = LED_FUNCTION_BLUETOOTH;
linux,default-trigger = "hci0rx";
linux,default-trigger = "hci0-power";
default-state = "off";
};
};

2
arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts
View File

@@ -65,13 +65,11 @@ &ufs_1_phy {
&ufs_0 {
status = "okay";
vcc-supply = <&ufs_0_fixed_vcc_reg>;
vcc-fixed-regulator;
};
&ufs_1 {
status = "okay";
vcc-supply = <&ufs_1_fixed_vcc_reg>;
vcc-fixed-regulator;
};
&usi_0 {