Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfed4d73 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'imx-fixes-4.20-2' of... 

Merge tag 'imx-fixes-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

i.MX fixes for 4.20, round 2:
 - Reomve non-existing EEPROM device from imx51-zii-rdu1 board.
   It was added by mistake.

* tag 'imx-fixes-4.20-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux

:
  ARM: dts: imx51-zii-rdu1: Remove EEPROM node

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 7e76e65c 512cab3e

arch/arm/boot/dts/imx51-zii-rdu1.dts

+0 −6
Original line number Diff line number Diff line
@@ -492,12 +492,6 @@ 
	pinctrl-0 = <&pinctrl_i2c2>;

	status = "okay";



	eeprom@50 {

		compatible = "atmel,24c04";

		pagesize = <16>;

		reg = <0x50>;

	};



	hpa1: amp@60 {

		compatible = "ti,tpa6130a2";

		reg = <0x60>;