diff options
| author | Olof Johansson <olof@lixom.net> | 2018-11-30 14:57:53 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-11-30 14:57:53 -0500 |
| commit | bfed4d730823440d0da0cd21554efc2de831627d (patch) | |
| tree | e03e6a06d4c5377cfbb585db6beed2ea8bc75f3d | |
| parent | 7e76e65ce7e9405a9608e1b806be58a6cbf4a737 (diff) | |
| parent | 512cab3e7e0be11234f965d9898936dce2325382 (diff) | |
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: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/boot/dts/imx51-zii-rdu1.dts | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/imx51-zii-rdu1.dts b/arch/arm/boot/dts/imx51-zii-rdu1.dts index e45a15ceb94b..69d753cac89a 100644 --- a/arch/arm/boot/dts/imx51-zii-rdu1.dts +++ b/arch/arm/boot/dts/imx51-zii-rdu1.dts | |||
| @@ -492,12 +492,6 @@ | |||
| 492 | pinctrl-0 = <&pinctrl_i2c2>; | 492 | pinctrl-0 = <&pinctrl_i2c2>; |
| 493 | status = "okay"; | 493 | status = "okay"; |
| 494 | 494 | ||
| 495 | eeprom@50 { | ||
| 496 | compatible = "atmel,24c04"; | ||
| 497 | pagesize = <16>; | ||
| 498 | reg = <0x50>; | ||
| 499 | }; | ||
| 500 | |||
| 501 | hpa1: amp@60 { | 495 | hpa1: amp@60 { |
| 502 | compatible = "ti,tpa6130a2"; | 496 | compatible = "ti,tpa6130a2"; |
| 503 | reg = <0x60>; | 497 | reg = <0x60>; |
