diff options
| author | Olof Johansson <olof@lixom.net> | 2017-12-02 17:01:40 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-12-02 17:01:40 -0800 |
| commit | 8d810a4029c6f0d9b19da3d96e1c29ed5930656a (patch) | |
| tree | 57fab51ab4298ab78060610bb975f1d5731ba17a /arch/arm | |
| parent | 8bd30f22984d58357dbef18d141fc1ef49d9994b (diff) | |
| parent | e501506d3ea00eefa64463ebd9e5c13ee70990bd (diff) | |
| download | linux-8d810a4029c6f0d9b19da3d96e1c29ed5930656a.tar.gz linux-8d810a4029c6f0d9b19da3d96e1c29ed5930656a.tar.bz2 linux-8d810a4029c6f0d9b19da3d96e1c29ed5930656a.zip | |
Merge tag 'imx-fixes-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
i.MX fixes for 4.15:
- A fix for vf610-zii-dev-rev-c board which correct the unit-address
of I2C EEPROM node to match the 'reg' property.
- We thought the RTC block on i.MX53 is compatible with the one found
on i.MX25, and added the device for i.MX53 device tree. But it turns
out that's not the case, and we have to revert the change.
* tag 'imx-fixes-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
Revert "ARM: dts: imx53: add srtc node"
ARM: dts: vf610-zii-dev-rev-c: Fix the I2C EEPROM address
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/imx53.dtsi | 9 | ||||
| -rw-r--r-- | arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 2 |
2 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi index 589a67c5f796..84f17f7abb71 100644 --- a/arch/arm/boot/dts/imx53.dtsi +++ b/arch/arm/boot/dts/imx53.dtsi @@ -433,15 +433,6 @@ clock-names = "ipg", "per"; }; - srtc: srtc@53fa4000 { - compatible = "fsl,imx53-rtc", "fsl,imx25-rtc"; - reg = <0x53fa4000 0x4000>; - interrupts = <24>; - interrupt-parent = <&tzic>; - clocks = <&clks IMX5_CLK_SRTC_GATE>; - clock-names = "ipg"; - }; - iomuxc: iomuxc@53fa8000 { compatible = "fsl,imx53-iomuxc"; reg = <0x53fa8000 0x4000>; diff --git a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts index 02a6227c717c..fbb3758ca2e3 100644 --- a/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts +++ b/arch/arm/boot/dts/vf610-zii-dev-rev-c.dts @@ -359,7 +359,7 @@ }; &i2c1 { - at24mac602@0 { + at24mac602@50 { compatible = "atmel,24c02"; reg = <0x50>; read-only; |