Commit cd36722d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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"
parents e59451fd 9e4d52a0

arch/x86/platform/ce4100/falconfalls.dts

+2 −2
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ i2c@1 { 


						gpio@26 {

							#gpio-cells = <2>;

							compatible = "ti,pcf8575";

							compatible = "nxp,pcf8575";

							reg = <0x26>;

							gpio-controller;

						};
@@ -263,7 +263,7 @@ i2c@2 { 


						gpio@26 {

							#gpio-cells = <2>;

							compatible = "ti,pcf8575";

							compatible = "nxp,pcf8575";

							reg = <0x26>;

							gpio-controller;

						};