Skip to content

L
linux
Commit 54dd3834 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'samsung-dt-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt 

Samsung DTS ARM changes for v5.16

Minor cleanups - from undocumented or unused properties, coding style.

* tag 'samsung-dt-5.16' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: use spaces instead of tabs around '='
  ARM: dts: exynos: remove unneeded DVS voltages from PMIC on Arndale
  ARM: dts: exynos: drop undocumented samsung,sata-freq property in Exynos5250

Link: https://lore.kernel.org/r/20211013162418.43072-1-krzysztof.kozlowski@canonical.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c7613530 7ec804d6
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 23 deletions
arch/arm/boot/dts/exynos4210-origen.dts
View file @ 54dd3834
...@@ -206,74 +206,74 @@ ldo3_reg: LDO3 { ...@@ -206,74 +206,74 @@ ldo3_reg: LDO3 {
ldo4_reg: LDO4 { ldo4_reg: LDO4 {
regulator-name = "VDD_RTC_1.8V"; regulator-name = "VDD_RTC_1.8V";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-always-on; regulator-always-on;
}; };
ldo6_reg: LDO6 { ldo6_reg: LDO6 {
regulator-name = "VMIPI_1.8V"; regulator-name = "VMIPI_1.8V";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-always-on; regulator-always-on;
}; };
ldo7_reg: LDO7 { ldo7_reg: LDO7 {
regulator-name = "VDD_AUD_1.8V"; regulator-name = "VDD_AUD_1.8V";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
}; };
ldo8_reg: LDO8 { ldo8_reg: LDO8 {
regulator-name = "VADC_3.3V"; regulator-name = "VADC_3.3V";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
}; };
ldo9_reg: LDO9 { ldo9_reg: LDO9 {
regulator-name = "DVDD_SWB_2.8V"; regulator-name = "DVDD_SWB_2.8V";
regulator-min-microvolt = <2800000>; regulator-min-microvolt = <2800000>;
regulator-max-microvolt = <2800000>; regulator-max-microvolt = <2800000>;
regulator-always-on; regulator-always-on;
}; };
ldo10_reg: LDO10 { ldo10_reg: LDO10 {
regulator-name = "VDD_PLL_1.1V"; regulator-name = "VDD_PLL_1.1V";
regulator-min-microvolt = <1100000>; regulator-min-microvolt = <1100000>;
regulator-max-microvolt = <1100000>; regulator-max-microvolt = <1100000>;
regulator-always-on; regulator-always-on;
}; };
ldo11_reg: LDO11 { ldo11_reg: LDO11 {
regulator-name = "VDD_AUD_3V"; regulator-name = "VDD_AUD_3V";
regulator-min-microvolt = <3000000>; regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>; regulator-max-microvolt = <3000000>;
}; };
ldo14_reg: LDO14 { ldo14_reg: LDO14 {
regulator-name = "AVDD18_SWB_1.8V"; regulator-name = "AVDD18_SWB_1.8V";
regulator-min-microvolt = <1800000>; regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>; regulator-max-microvolt = <1800000>;
regulator-always-on; regulator-always-on;
}; };
ldo17_reg: LDO17 { ldo17_reg: LDO17 {
regulator-name = "VDD_SWB_3.3V"; regulator-name = "VDD_SWB_3.3V";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-always-on; regulator-always-on;
}; };
ldo21_reg: LDO21 { ldo21_reg: LDO21 {
regulator-name = "VDD_MIF_1.2V"; regulator-name = "VDD_MIF_1.2V";
regulator-min-microvolt = <1200000>; regulator-min-microvolt = <1200000>;
regulator-max-microvolt = <1200000>; regulator-max-microvolt = <1200000>;
regulator-always-on; regulator-always-on;
}; };
buck1_reg: BUCK1 { buck1_reg: BUCK1 {
regulator-name = "VDD_ARM_1.2V"; regulator-name = "VDD_ARM_1.2V";
regulator-min-microvolt = <950000>; regulator-min-microvolt = <950000>;
regulator-max-microvolt = <1350000>; regulator-max-microvolt = <1350000>;
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;
}; };
...@@ -281,7 +281,7 @@ buck1_reg: BUCK1 { ...@@ -281,7 +281,7 @@ buck1_reg: BUCK1 {
buck2_reg: BUCK2 { buck2_reg: BUCK2 {
regulator-name = "VDD_INT_1.1V"; regulator-name = "VDD_INT_1.1V";
regulator-min-microvolt = <900000>; regulator-min-microvolt = <900000>;
regulator-max-microvolt = <1100000>; regulator-max-microvolt = <1100000>;
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;
}; };
......
arch/arm/boot/dts/exynos4412-origen.dts
View file @ 54dd3834
...@@ -382,7 +382,7 @@ ldo28_reg: LDO28 { ...@@ -382,7 +382,7 @@ ldo28_reg: LDO28 {
buck1_reg: BUCK1 { buck1_reg: BUCK1 {
regulator-name = "VDD_MIF"; regulator-name = "VDD_MIF";
regulator-min-microvolt = <950000>; regulator-min-microvolt = <950000>;
regulator-max-microvolt = <1100000>; regulator-max-microvolt = <1100000>;
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;
op_mode = <1>; /* Normal Mode */ op_mode = <1>; /* Normal Mode */
...@@ -391,7 +391,7 @@ buck1_reg: BUCK1 { ...@@ -391,7 +391,7 @@ buck1_reg: BUCK1 {
buck2_reg: BUCK2 { buck2_reg: BUCK2 {
regulator-name = "VDD_ARM"; regulator-name = "VDD_ARM";
regulator-min-microvolt = <900000>; regulator-min-microvolt = <900000>;
regulator-max-microvolt = <1350000>; regulator-max-microvolt = <1350000>;
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;
op_mode = <1>; /* Normal Mode */ op_mode = <1>; /* Normal Mode */
...@@ -400,7 +400,7 @@ buck2_reg: BUCK2 { ...@@ -400,7 +400,7 @@ buck2_reg: BUCK2 {
buck3_reg: BUCK3 { buck3_reg: BUCK3 {
regulator-name = "VDD_INT"; regulator-name = "VDD_INT";
regulator-min-microvolt = <900000>; regulator-min-microvolt = <900000>;
regulator-max-microvolt = <1200000>; regulator-max-microvolt = <1200000>;
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;
op_mode = <1>; /* Normal Mode */ op_mode = <1>; /* Normal Mode */
...@@ -409,7 +409,7 @@ buck3_reg: BUCK3 { ...@@ -409,7 +409,7 @@ buck3_reg: BUCK3 {
buck4_reg: BUCK4 { buck4_reg: BUCK4 {
regulator-name = "VDD_G3D"; regulator-name = "VDD_G3D";
regulator-min-microvolt = <750000>; regulator-min-microvolt = <750000>;
regulator-max-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;
op_mode = <1>; /* Normal Mode */ op_mode = <1>; /* Normal Mode */
...@@ -418,7 +418,7 @@ buck4_reg: BUCK4 { ...@@ -418,7 +418,7 @@ buck4_reg: BUCK4 {
buck5_reg: BUCK5 { buck5_reg: BUCK5 {
regulator-name = "VDD_M12"; regulator-name = "VDD_M12";
regulator-min-microvolt = <750000>; regulator-min-microvolt = <750000>;
regulator-max-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;
op_mode = <1>; /* Normal Mode */ op_mode = <1>; /* Normal Mode */
...@@ -427,7 +427,7 @@ buck5_reg: BUCK5 { ...@@ -427,7 +427,7 @@ buck5_reg: BUCK5 {
buck6_reg: BUCK6 { buck6_reg: BUCK6 {
regulator-name = "VDD12_5M"; regulator-name = "VDD12_5M";
regulator-min-microvolt = <750000>; regulator-min-microvolt = <750000>;
regulator-max-microvolt = <1500000>; regulator-max-microvolt = <1500000>;
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;
op_mode = <1>; /* Normal Mode */ op_mode = <1>; /* Normal Mode */
...@@ -436,7 +436,7 @@ buck6_reg: BUCK6 { ...@@ -436,7 +436,7 @@ buck6_reg: BUCK6 {
buck9_reg: BUCK9 { buck9_reg: BUCK9 {
regulator-name = "VDDF28_EMMC"; regulator-name = "VDDF28_EMMC";
regulator-min-microvolt = <750000>; regulator-min-microvolt = <750000>;
regulator-max-microvolt = <3000000>; regulator-max-microvolt = <3000000>;
regulator-always-on; regulator-always-on;
regulator-boot-on; regulator-boot-on;
op_mode = <1>; /* Normal Mode */ op_mode = <1>; /* Normal Mode */
......
arch/arm/boot/dts/exynos5250-arndale.dts
View file @ 54dd3834
...@@ -240,9 +240,6 @@ pmic@66 { ...@@ -240,9 +240,6 @@ pmic@66 {
vinl8-supply = <&buck8_reg>; vinl8-supply = <&buck8_reg>;
vinl9-supply = <&buck8_reg>; vinl9-supply = <&buck8_reg>;
s5m8767,pmic-buck2-dvs-voltage = <1300000>;
s5m8767,pmic-buck3-dvs-voltage = <1100000>;
s5m8767,pmic-buck4-dvs-voltage = <1200000>;
s5m8767,pmic-buck-dvs-gpios = <&gpd1 0 GPIO_ACTIVE_HIGH>, s5m8767,pmic-buck-dvs-gpios = <&gpd1 0 GPIO_ACTIVE_HIGH>,
<&gpd1 1 GPIO_ACTIVE_HIGH>, <&gpd1 1 GPIO_ACTIVE_HIGH>,
<&gpd1 2 GPIO_ACTIVE_HIGH>; <&gpd1 2 GPIO_ACTIVE_HIGH>;
......
arch/arm/boot/dts/exynos5250.dtsi
View file @ 54dd3834
...@@ -386,7 +386,6 @@ tmu: tmu@10060000 { ...@@ -386,7 +386,6 @@ tmu: tmu@10060000 {
sata: sata@122f0000 { sata: sata@122f0000 {
compatible = "snps,dwc-ahci"; compatible = "snps,dwc-ahci";
samsung,sata-freq = <66>;
reg = <0x122F0000 0x1ff>; reg = <0x122F0000 0x1ff>;
interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clock CLK_SATA>, <&clock CLK_SCLK_SATA>; clocks = <&clock CLK_SATA>, <&clock CLK_SCLK_SATA>;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7