From 454ca715ff9f88c4e02ac892f196da8a1d90d052 Mon Sep 17 00:00:00 2001 From: Phil Elwell Date: Mon, 9 Jul 2018 21:11:32 +0100 Subject: [PATCH 348/454] overlays: Add addr parameter to i2c-rtc (& -gpio) See: https://github.com/raspberrypi/linux/issues/2611 Signed-off-by: Phil Elwell --- arch/arm/boot/dts/overlays/README | 10 +++++++ .../dts/overlays/i2c-rtc-gpio-overlay.dts | 28 +++++++++++++++++++ .../arm/boot/dts/overlays/i2c-rtc-overlay.dts | 11 ++++++++ 3 files changed, 49 insertions(+) --- a/arch/arm/boot/dts/overlays/README +++ b/arch/arm/boot/dts/overlays/README @@ -826,6 +826,10 @@ Params: abx80x Select o pcf8563 Select the PCF8563 device + addr Sets the address for the RTC. Note that the + device must be configured to use the specified + address. + trickle-diode-type Diode type for trickle charge - "standard" or "schottky" (ABx80x only) @@ -850,6 +854,8 @@ Params: abx80x Select o ds3231 Select the DS3231 device + m41t62 Select the M41T62 device + mcp7940x Select the MCP7940x device mcp7941x Select the MCP7941x device @@ -860,6 +866,10 @@ Params: abx80x Select o pcf8563 Select the PCF8563 device + addr Sets the address for the RTC. Note that the + device must be configured to use the specified + address. + trickle-diode-type Diode type for trickle charge - "standard" or "schottky" (ABx80x only) --- a/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts +++ b/arch/arm/boot/dts/overlays/i2c-rtc-gpio-overlay.dts @@ -159,6 +159,21 @@ }; }; + fragment@10 { + target = <&i2c_arm>; + __dormant__ { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + m41t62: m41t62@68 { + compatible = "st,m41t62"; + reg = <0x68>; + status = "okay"; + }; + }; + }; + __overrides__ { abx80x = <0>,"+1"; ds1307 = <0>,"+2"; @@ -169,6 +184,19 @@ pcf2127 = <0>,"+7"; pcf8523 = <0>,"+8"; pcf8563 = <0>,"+9"; + m41t62 = <0>,"+10"; + + addr = <&abx80x>, "reg:0", + <&ds1307>, "reg:0", + <&ds1339>, "reg:0", + <&ds3231>, "reg:0", + <&mcp7940x>, "reg:0", + <&mcp7941x>, "reg:0", + <&pcf2127>, "reg:0", + <&pcf8523>, "reg:0", + <&pcf8563>, "reg:0", + <&m41t62>, "reg:0"; + trickle-diode-type = <&abx80x>,"abracon,tc-diode"; trickle-resistor-ohms = <&ds1339>,"trickle-resistor-ohms:0", <&abx80x>,"abracon,tc-resistor"; --- a/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts +++ b/arch/arm/boot/dts/overlays/i2c-rtc-overlay.dts @@ -169,6 +169,17 @@ pcf8523 = <0>,"+7"; pcf8563 = <0>,"+8"; m41t62 = <0>,"+9"; + + addr = <&abx80x>, "reg:0", + <&ds1307>, "reg:0", + <&ds1339>, "reg:0", + <&ds3231>, "reg:0", + <&mcp7940x>, "reg:0", + <&mcp7941x>, "reg:0", + <&pcf2127>, "reg:0", + <&pcf8523>, "reg:0", + <&pcf8563>, "reg:0", + <&m41t62>, "reg:0"; trickle-diode-type = <&abx80x>,"abracon,tc-diode"; trickle-resistor-ohms = <&ds1339>,"trickle-resistor-ohms:0", <&abx80x>,"abracon,tc-resistor";