diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2024-01-25 18:23:10 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-01-25 18:23:10 +0100 |
| commit | 0d1d824a4ac102db35bc8524a8be97ada8ad37ab (patch) | |
| tree | eeb1ce369485d65dc8934757ba4f4cfffc9d4a35 | |
| parent | 8ad2c84e2ecb476c96eb5508848e6f160962d3f5 (diff) | |
| parent | eab4f56d3e75dad697acf8dc2c8be3c341d6c63e (diff) | |
| download | linux-0d1d824a4ac102db35bc8524a8be97ada8ad37ab.tar.gz | |
Merge tag 'samsung-fixes-6.8' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/fixes
Samsung fixes for v6.8
1. Google GS101: Correct the input clock names to CMU MISC clock
controller to match received review. The review was initially missed
and CMU MISC clock controller bindings, driver and DTS was merged
into v6.8-rc1 with different names. Nothing was released so far, so
the bindings and driver can be still corrected to match review.
2. Samsung Galaxy Tab3: Fix display by using correct vclk polarity in
display node.
* tag 'samsung-fixes-6.8' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
ARM: dts: exynos4212-tab3: add samsung,invert-vclk flag to fimd
arm64: dts: exynos: gs101: comply with the new cmu_misc clock names
Link: https://lore.kernel.org/r/20240125082400.163935-1-krzysztof.kozlowski@linaro.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi | 1 | ||||
| -rw-r--r-- | arch/arm64/boot/dts/exynos/google/gs101.dtsi | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi index d7954ff466b491..e5254e32aa8fc3 100644 --- a/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi +++ b/arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi @@ -434,6 +434,7 @@ }; &fimd { + samsung,invert-vclk; status = "okay"; }; diff --git a/arch/arm64/boot/dts/exynos/google/gs101.dtsi b/arch/arm64/boot/dts/exynos/google/gs101.dtsi index 9747cb3fa03ac5..d838e3a7af6e5d 100644 --- a/arch/arm64/boot/dts/exynos/google/gs101.dtsi +++ b/arch/arm64/boot/dts/exynos/google/gs101.dtsi @@ -289,7 +289,7 @@ #clock-cells = <1>; clocks = <&cmu_top CLK_DOUT_CMU_MISC_BUS>, <&cmu_top CLK_DOUT_CMU_MISC_SSS>; - clock-names = "dout_cmu_misc_bus", "dout_cmu_misc_sss"; + clock-names = "bus", "sss"; }; watchdog_cl0: watchdog@10060000 { |