diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-10 09:21:36 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-01-10 09:21:36 -0800 |
| commit | cd36722d74733b748ae812e37dcfe035b420de67 (patch) | |
| tree | a6158d82886b2d3d2c72a39b64e75d95b2e436e8 /arch | |
| parent | Merge tag 'x86_paravirt_for_v5.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (diff) | |
| parent | x86/ce4100: Replace "ti,pcf8575" by "nxp,pcf8575" (diff) | |
| download | linux-dev-cd36722d74733b748ae812e37dcfe035b420de67.tar.xz linux-dev-cd36722d74733b748ae812e37dcfe035b420de67.zip | |
Merge tag 'x86_platform_for_v5.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform fix from Borislav Petkov:
"A single DT compatibility fix for the Intel media processor CE4100
driver"
* tag 'x86_platform_for_v5.17_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/ce4100: Replace "ti,pcf8575" by "nxp,pcf8575"
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/platform/ce4100/falconfalls.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/platform/ce4100/falconfalls.dts b/arch/x86/platform/ce4100/falconfalls.dts index 0ac3d4357136..65fa3d866226 100644 --- a/arch/x86/platform/ce4100/falconfalls.dts +++ b/arch/x86/platform/ce4100/falconfalls.dts @@ -249,7 +249,7 @@ gpio@26 { #gpio-cells = <2>; - compatible = "ti,pcf8575"; + compatible = "nxp,pcf8575"; reg = <0x26>; gpio-controller; }; @@ -263,7 +263,7 @@ gpio@26 { #gpio-cells = <2>; - compatible = "ti,pcf8575"; + compatible = "nxp,pcf8575"; reg = <0x26>; gpio-controller; }; |