sunxi: pinephone: differentiate hw revisions 1.2 and 1.2b

In newer 1.2 PinePhone board revisions LIS3MDL magnetometer was replaced by
AF8133J. They use the same PB1 pin in different modes.

LIS3MDL uses it as an gpio input to handle interrupt.
AF8133J uses it as an gpio output as a reset signal.

It wasn't possible at runtime to enable both device tree
nodes and detect supported sensor at probe time. As a result new board
revision was introduced with AF8133J definition (1.2b).

AF8133J has reset pin (PB1) connected to the SoC. By default AF8133J
is in a reset state and don't respond to probe request on I2C
bus. Extra code would be needed to handle reset signal. Therefore this
code uses LIS3MDL magnetometer (1.2) revision instead of
AF8133J (1.2b) to detect board revision.

Signed-off-by: Andrey Skvortsov <andrej.skvortzov@gmail.com>

Author: AndreySV

arch/arm/dts/Makefile

@@ -760,6 +760,7 @@ dtb-$(CONFIG_MACH_SUN50I) += \
 	sun50i-a64-pinephone-1.0.dtb \
 	sun50i-a64-pinephone-1.1.dtb \
 	sun50i-a64-pinephone-1.2.dtb \
+	sun50i-a64-pinephone-1.2b.dtb \
 	sun50i-a64-pinetab.dtb \
 	sun50i-a64-sopine-baseboard.dtb \
 	sun50i-a64-teres-i.dtb

arch/arm/dts/sun50i-a64-pinephone-1.2b.dts

@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+// Copyright (C) 2020 Ondrej Jirman <megous@megous.com>
+
+/dts-v1/;
+
+#include "sun50i-a64-pinephone-1.2.dts"
+
+/ {
+	model = "Pine64 PinePhone (1.2b)";
+	compatible = "pine64,pinephone-1.2b", "pine64,pinephone", "allwinner,sun50i-a64";
+};
+
+&lis3mdl {
+	status = "disabled";
+};
+

board/sunxi/board.c

@@ -18,6 +18,7 @@
 #include <image.h>
 #include <init.h>
 #include <log.h>
+#include <i2c.h>
 #include <mmc.h>
 #include <axp_pmic.h>
 #include <generic-phy.h>
@@ -52,6 +53,9 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#define PINEPHONE_LIS3MDL_I2C_ADDR	0x1E
+#define PINEPHONE_LIS3MDL_I2C_BUS	1 /* I2C1 */
+
 void i2c_init_board(void)
 {
 #ifdef CONFIG_I2C0_ENABLE
@@ -968,6 +972,9 @@ int board_fit_config_name_match(const char *name)
 {
 	const char *best_dt_name = get_spl_dt_name();
 	int ret;
+#if CONFIG_IS_ENABLED(DM_I2C)
+	struct udevice *bus, *dev;
+#endif
 
 #ifdef CONFIG_DEFAULT_DEVICE_TREE
 	if (best_dt_name == NULL)
@@ -994,11 +1001,21 @@ int board_fit_config_name_match(const char *name)
 		udelay(100);
 
 		/* PL6 is pulled low by the modem on v1.2. */
-		if (gpio_get_value(SUNXI_GPL(6)) == 0)
-			best_dt_name = "sun50i-a64-pinephone-1.2";
-		else
-			best_dt_name = "sun50i-a64-pinephone-1.1";
+		if (gpio_get_value(SUNXI_GPL(6)) == 0) {
+			best_dt_name = "sun50i-a64-pinephone-1.2b";
 
+			/* 1.2 has different I2C magnetometer */
+#if CONFIG_IS_ENABLED(DM_I2C)
+			if (!uclass_get_device_by_seq(UCLASS_I2C, PINEPHONE_LIS3MDL_I2C_BUS, &bus))
+				if (!dm_i2c_probe(bus, PINEPHONE_LIS3MDL_I2C_ADDR, 0, &dev))
+					best_dt_name = "sun50i-a64-pinephone-1.2";
+#else
+			if (!i2c_set_bus_num(PINEPHONE_LIS3MDL_I2C_BUS))
+				if (!i2c_probe(PINEPHONE_LIS3MDL_I2C_ADDR))
+					best_dt_name = "sun50i-a64-pinephone-1.2";
+#endif
+		} else
+			best_dt_name = "sun50i-a64-pinephone-1.1";
 		sunxi_gpio_set_cfgpin(SUNXI_GPL(6), SUNXI_GPIO_DISABLE);
 		sunxi_gpio_set_pull(SUNXI_GPL(6), SUNXI_GPIO_PULL_DISABLE);
 		prcm_apb0_disable(PRCM_APB0_GATE_PIO);

configs/pinephone_defconfig

@@ -9,10 +9,16 @@ CONFIG_SUNXI_DRAM_LPDDR3_STOCK=y
 CONFIG_DRAM_CLK=552
 CONFIG_DRAM_ZQ=3881949
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
+CONFIG_I2C0_ENABLE=y
+CONFIG_I2C1_ENABLE=y
+CONFIG_R_I2C_ENABLE=y
 CONFIG_PINEPHONE_DT_SELECTION=y
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
-CONFIG_OF_LIST="sun50i-a64-pinephone-1.1 sun50i-a64-pinephone-1.2"
+CONFIG_SPL_I2C=y
+CONFIG_OF_LIST="sun50i-a64-pinephone-1.1 sun50i-a64-pinephone-1.2 sun50i-a64-pinephone-1.2b"
+CONFIG_SPL_SYS_I2C_LEGACY=y
 CONFIG_SYS_I2C_SUN8I_RSB=y
+CONFIG_SYS_I2C_MVTWSI=y
 CONFIG_LED_STATUS=y
 CONFIG_LED_STATUS_GPIO=y
 CONFIG_LED_STATUS0=y