WIP: sandbox: Update dts files
Signed-off-by: Tom Rini <trini@konsulko.com>
diff --git a/arch/sandbox/dts/sandbox.dts b/arch/sandbox/dts/sandbox.dts
index a41b5f0..1f65dee 100644
--- a/arch/sandbox/dts/sandbox.dts
+++ b/arch/sandbox/dts/sandbox.dts
@@ -65,7 +65,7 @@
fake-host-hwaddr = [00 00 66 44 22 00];
};
- gpio_a: gpios@0 {
+ gpio_a: base-gpios {
u-boot,dm-pre-reloc;
gpio-controller;
compatible = "sandbox,gpio";
@@ -74,7 +74,7 @@
sandbox,gpio-count = <20>;
};
- gpio_b: gpios@1 {
+ gpio_b: extra-gpios {
u-boot,dm-pre-reloc;
gpio-controller;
compatible = "sandbox,gpio";
@@ -89,7 +89,7 @@
sides = <6>;
};
- i2c_0: i2c@0 {
+ i2c_0: i2c@10001000 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0 0>;
@@ -108,7 +108,7 @@
compatible = "sandbox-rtc";
sandbox,emul = <&emul0>;
};
- sandbox_pmic: sandbox_pmic {
+ sandbox_pmic: sandbox_pmic@40 {
reg = <0x40>;
};
@@ -116,7 +116,7 @@
reg = <0x41>;
};
- i2c_emul: emul {
+ i2c_emul: emul@ff {
reg = <0xff>;
compatible = "sandbox,i2c-emul-parent";
emul_eeprom: emul-eeprom {
@@ -194,7 +194,7 @@
};
};
- reset@1 {
+ reset@10004000 {
compatible = "sandbox,reset";
};
@@ -209,7 +209,7 @@
};
};
- spi@0 {
+ spi {
u-boot,dm-pre-reloc;
#address-cells = <1>;
#size-cells = <0>;
@@ -298,7 +298,7 @@
pinctrl-0 = <&pinctrl_serial0>;
};
- usb@0 {
+ usb0 {
compatible = "sandbox,usb";
status = "disabled";
hub {
@@ -312,7 +312,7 @@
};
};
- usb@1 {
+ usb1 {
compatible = "sandbox,usb";
hub {
compatible = "usb-hub";
@@ -330,12 +330,12 @@
};
};
- usb@2 {
+ usb2 {
compatible = "sandbox,usb";
status = "disabled";
};
- spmi: spmi@0 {
+ spmi: spmi@1000E000 {
compatible = "sandbox,spmi";
#address-cells = <0x1>;
#size-cells = <0x1>;
diff --git a/arch/sandbox/dts/sandbox64.dts b/arch/sandbox/dts/sandbox64.dts
index a3c95f2..02f0fc5 100644
--- a/arch/sandbox/dts/sandbox64.dts
+++ b/arch/sandbox/dts/sandbox64.dts
@@ -298,7 +298,7 @@
status = "disabled";
};
- spmi: spmi@0 {
+ spmi: spmi@1000E000 {
compatible = "sandbox,spmi";
#address-cells = <0x1>;
#size-cells = <0x1>;
diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts
index 8b2d645..8bcccae 100644
--- a/arch/sandbox/dts/test.dts
+++ b/arch/sandbox/dts/test.dts
@@ -13,7 +13,7 @@
eth5 = ð_5;
gpio1 = &gpio_a;
gpio2 = &gpio_b;
- i2c0 = "/i2c@0";
+ i2c0 = "/i2c@10000000";
mmc0 = "/mmc0";
mmc1 = "/mmc1";
pci0 = &pci0;
@@ -23,7 +23,7 @@
remoteproc2 = &rproc_2;
rtc0 = &rtc_0;
rtc1 = &rtc_1;
- spi0 = "/spi@0";
+ spi0 = "/spi@10001000";
testfdt6 = "/e-test";
testbus3 = "/some-bus";
testfdt0 = "/some-bus/c-test@0";
@@ -127,12 +127,12 @@
ping-add = <3>;
};
- phy_provider0: gen_phy@0 {
+ phy_provider0: gen_phy@10009000 {
compatible = "sandbox,phy";
#phy-cells = <1>;
};
- phy_provider1: gen_phy@1 {
+ phy_provider1: gen_phy@1000A000 {
compatible = "sandbox,phy";
#phy-cells = <0>;
broken;
@@ -272,7 +272,7 @@
sandbox,gpio-count = <10>;
};
- i2c@0 {
+ i2c@10000000 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0 1>;
@@ -296,7 +296,7 @@
sandbox,emul = <&emul1>;
};
- i2c_emul: emul {
+ i2c_emul: emul@ff {
reg = <0xff>;
compatible = "sandbox,i2c-emul-parent";
emul_eeprom: emul-eeprom {
@@ -312,7 +312,7 @@
};
};
- sandbox_pmic: sandbox_pmic {
+ sandbox_pmic: sandbox_pmic@40 {
reg = <0x40>;
sandbox,emul = <&emul_pmic0>;
};
@@ -323,13 +323,13 @@
};
};
- bootcount@0 {
+ bootcount@1000C000 {
compatible = "u-boot,bootcount-rtc";
rtc = <&rtc_1>;
offset = <0x13>;
};
- adc@0 {
+ adc@1000B000 {
compatible = "sandbox,adc";
vdd-supply = <&buck2>;
vss-microvolts = <0>;
@@ -521,11 +521,11 @@
compatible = "sandbox,ram";
};
- reset@0 {
+ reset@10008000 {
compatible = "sandbox,warm-reset";
};
- reset@1 {
+ reset@1000F000 {
compatible = "sandbox,reset";
};
@@ -556,7 +556,7 @@
backlight = <&backlight 0 100>;
};
- smem@0 {
+ smem@1000D000 {
compatible = "sandbox,smem";
};
@@ -571,7 +571,7 @@
};
};
- spi@0 {
+ spi@10001000 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0 1>;
@@ -585,12 +585,12 @@
};
};
- syscon0: syscon@0 {
+ syscon0: syscon@20002000 {
compatible = "sandbox,syscon0";
reg = <0x10 16>;
};
- another_system_controller: syscon@1 {
+ another_system_controller: syscon@20003000 {
compatible = "sandbox,syscon1";
reg = <0x20 5
0x28 6
@@ -598,7 +598,7 @@
0x38 8>;
};
- syscon2: syscon@2 {
+ syscon2: syscon@20004000 {
compatible = "simple-mfd", "syscon";
reg = <0x40 5
0x48 6
@@ -620,7 +620,7 @@
u-boot,dm-pre-reloc;
};
- usb_0: usb@0 {
+ usb_0: usb@10005000 {
compatible = "sandbox,usb";
status = "disabled";
hub {
@@ -634,7 +634,7 @@
};
};
- usb_1: usb@1 {
+ usb_1: usb@10006000 {
compatible = "sandbox,usb";
hub {
compatible = "usb-hub";
@@ -670,12 +670,12 @@
};
};
- usb_2: usb@2 {
+ usb_2: usb@10007000 {
compatible = "sandbox,usb";
status = "disabled";
};
- spmi: spmi@0 {
+ spmi: spmi@1000E000 {
compatible = "sandbox,spmi";
#address-cells = <0x1>;
#size-cells = <0x1>;
@@ -696,11 +696,11 @@
};
};
- wdt0: wdt@0 {
+ wdt0: wdt@20005000 {
compatible = "sandbox,wdt";
};
- axi: axi@0 {
+ axi: axi@20006000 {
compatible = "sandbox,axi";
#address-cells = <0x1>;
#size-cells = <0x1>;
@@ -788,7 +788,7 @@
compatible = "sandbox,pinctrl";
};
- hwspinlock@0 {
+ hwspinlock@20007000 {
compatible = "sandbox,hwspinlock";
};
diff --git a/include/sandbox-adc.h b/include/sandbox-adc.h
index 2017b9c..01be5c2 100644
--- a/include/sandbox-adc.h
+++ b/include/sandbox-adc.h
@@ -7,7 +7,7 @@
#ifndef _SANDBOX_ADC_H_
#define _SANDBOX_ADC_H_
-#define SANDBOX_ADC_DEVNAME "adc@0"
+#define SANDBOX_ADC_DEVNAME "adc@1000B000"
#define SANDBOX_ADC_DATA_MASK 0xffff /* 16-bits resolution */
#define SANDBOX_ADC_CHANNELS 4
#define SANDBOX_ADC_CHANNEL0_DATA 0x0
diff --git a/test/dm/pmic.c b/test/dm/pmic.c
index b582329..8f88656 100644
--- a/test/dm/pmic.c
+++ b/test/dm/pmic.c
@@ -39,7 +39,7 @@
/* Test PMIC get method */
static int dm_test_power_pmic_get(struct unit_test_state *uts)
{
- power_pmic_get(uts, "sandbox_pmic");
+ power_pmic_get(uts, "sandbox_pmic@40");
return 0;
}
diff --git a/test/dm/spmi.c b/test/dm/spmi.c
index e6a9108..4790e98 100644
--- a/test/dm/spmi.c
+++ b/test/dm/spmi.c
@@ -18,7 +18,7 @@
/* Test if bus childs got probed propperly*/
static int dm_test_spmi_probe(struct unit_test_state *uts)
{
- const char *name = "spmi@0";
+ const char *name = "spmi@1000E000";
struct udevice *bus, *dev;
ut_assertok(uclass_get_device(UCLASS_SPMI, 0, &bus));