Skip to content

Commit 0d1d824

Browse files
committed
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/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 8ad2c84 + eab4f56 commit 0d1d824

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -434,6 +434,7 @@
434434
};
435435

436436
&fimd {
437+
samsung,invert-vclk;
437438
status = "okay";
438439
};
439440

arch/arm64/boot/dts/exynos/google/gs101.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@
289289
#clock-cells = <1>;
290290
clocks = <&cmu_top CLK_DOUT_CMU_MISC_BUS>,
291291
<&cmu_top CLK_DOUT_CMU_MISC_SSS>;
292-
clock-names = "dout_cmu_misc_bus", "dout_cmu_misc_sss";
292+
clock-names = "bus", "sss";
293293
};
294294

295295
watchdog_cl0: watchdog@10060000 {

0 commit comments

Comments
 (0)