shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

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

Several cleanups pointed out by `make dtbs_check`:
1. Align LED status node name with bindings.
2. Drop redundant properties.
3. Move i2c-gpio node out of soc to top-level, as soc node is expected
   to have only MMIO nodes.
4. Correct SPI NOR flash compatible in SMDK5250 and SMDKv310.
5. Align GPIO property names in WM1811-family codec nodes with bindings.
6. Correct MAX98090 codec DAI cells in Snow.

* tag 'samsung-dt-6.3-2' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: dts: exynos: correct max98090 DAI argument in Snow
  ARM: dts: s5pv210: add "gpios" suffix to wlf,ldo1ena on Aries
  ARM: dts: exynos: add "gpios" suffix to wlf,ldo1ena on Arndale
  ARM: dts: exynos: add "gpios" suffix to wlf,ldo1ena on Midas
  ARM: dts: exynos: correct SPI nor compatible in SMDK5250
  ARM: dts: exynos: correct SPI nor compatible in SMDKv310
  ARM: dts: exynos: move I2C10 out of soc node on Arndale
  ARM: dts: exynos: drop redundant address/size cells from I2C10 on Arndale
  ARM: dts: exynos: drop default status from I2C10 on Arndale
  ARM: dts: exynos: align status led name with bindings on Origen4210

Link: https://lore.kernel.org/r/20230211113103.58894-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2023-02-13 15:38:57 +01:00
parent 306b8201b0 301d3dd055
commit 59b05cfa53
7 changed files with 24 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/exynos4210-origen.dts
View File

@@ -85,7 +85,7 @@
leds {
compatible = "gpio-leds";
status {
led-status {
gpios = <&gpx1 3 GPIO_ACTIVE_LOW>;
function = LED_FUNCTION_HEARTBEAT;
linux,default-trigger = "heartbeat";

2
arch/arm/boot/dts/exynos4210-smdkv310.dts
View File

@@ -203,7 +203,7 @@
flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "w25x80";
compatible = "winbond,w25x80", "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <1000000>;

4
arch/arm/boot/dts/exynos4412-midas.dtsi
View File

@@ -653,8 +653,8 @@
CPVDD-supply = <&vbatt_reg>;
SPKVDD1-supply = <&vbatt_reg>;
SPKVDD2-supply = <&vbatt_reg>;
wlf,ldo1ena = <&gpj0 4 0>;
wlf,ldo2ena = <&gpj0 4 0>;
wlf,ldo1ena-gpios = <&gpj0 4 GPIO_ACTIVE_HIGH>;
wlf,ldo2ena-gpios = <&gpj0 4 GPIO_ACTIVE_HIGH>;
};
};

35
arch/arm/boot/dts/exynos5250-arndale.dts
View File

@@ -73,6 +73,19 @@
};
};
/*
* For unknown reasons HDMI-DDC does not work with Exynos I2C
* controllers. Lets use software I2C over GPIO pins as a workaround.
*/
i2c_ddc: i2c-10 {
compatible = "i2c-gpio";
pinctrl-names = "default";
pinctrl-0 = <&i2c2_gpio_bus>;
sda-gpios = <&gpa0 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpa0 7 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
i2c-gpio,delay-us = <2>;
};
panel: panel {
compatible = "boe,hv070wsa-100";
power-supply = <&vcc_3v3_reg>;
@@ -524,8 +537,8 @@
SPKVDD1-supply = <&main_dc_reg>;
SPKVDD2-supply = <&main_dc_reg>;
wlf,ldo1ena = <&gpb0 0 GPIO_ACTIVE_HIGH>;
wlf,ldo2ena = <&gpb0 1 GPIO_ACTIVE_HIGH>;
wlf,ldo1ena-gpios = <&gpb0 0 GPIO_ACTIVE_HIGH>;
wlf,ldo2ena-gpios = <&gpb0 1 GPIO_ACTIVE_HIGH>;
};
};
@@ -615,24 +628,6 @@
status = "okay";
};
&soc {
/*
* For unknown reasons HDMI-DDC does not work with Exynos I2C
* controllers. Lets use software I2C over GPIO pins as a workaround.
*/
i2c_ddc: i2c-10 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_gpio_bus>;
status = "okay";
compatible = "i2c-gpio";
sda-gpios = <&gpa0 6 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
scl-gpios = <&gpa0 7 (GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN)>;
i2c-gpio,delay-us = <2>;
#address-cells = <1>;
#size-cells = <0>;
};
};
&usbdrd {
vdd10-supply = <&ldo15_reg>;
vdd33-supply = <&ldo12_reg>;

2
arch/arm/boot/dts/exynos5250-smdk5250.dts
View File

@@ -391,7 +391,7 @@
flash@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "w25x80";
compatible = "winbond,w25x80", "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <1000000>;

4
arch/arm/boot/dts/exynos5250-snow-rev5.dts
View File

@@ -27,7 +27,7 @@
};
codec {
sound-dai = <&max98090 0>, <&hdmi>;
sound-dai = <&max98090>, <&hdmi>;
};
};
};
@@ -42,7 +42,7 @@
pinctrl-0 = <&max98090_irq>;
clocks = <&pmu_system_controller 0>;
clock-names = "mclk";
#sound-dai-cells = <1>;
#sound-dai-cells = <0>;
};
};

4
arch/arm/boot/dts/s5pv210-aries.dtsi
View File

@@ -135,8 +135,8 @@
0xa101 0x0100 0x8100 0x0100 0x0100
0x0100>;
wlf,ldo1ena = <&gpf3 4 GPIO_ACTIVE_HIGH>;
wlf,ldo2ena = <&gpf3 4 GPIO_ACTIVE_HIGH>;
wlf,ldo1ena-gpios = <&gpf3 4 GPIO_ACTIVE_HIGH>;
wlf,ldo2ena-gpios = <&gpf3 4 GPIO_ACTIVE_HIGH>;
wlf,lineout1-se;
wlf,lineout2-se;