mirrors/u-boot
0
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2024-12-14 07:13:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge git://git.denx.de/u-boot-samsung

Browse Source
This commit is contained in:
Tom Rini 2017-12-13 17:58:18 -05:00
commit 9ebc54b8a6
10 changed files with 584 additions and 558 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
arch/arm/dts/exynos4.dtsi
View File

@ -28,31 +28,39 @@
reg = <0x10440000 0x1000>; reg = <0x10440000 0x1000>;
}; };
serial@13800000 { gic: interrupt-controller@10490000 {
compatible = "arm,cortex-a9-gic";
#interrupt-cells = <3>;
interrupt-controller;
cpu-offset = <0x4000>;
reg = <0x10490000 0x10000>, <0x10480000 0x10000>;
};
serial_0: serial@13800000 {
compatible = "samsung,exynos4210-uart"; compatible = "samsung,exynos4210-uart";
reg = <0x13800000 0x3c>; reg = <0x13800000 0x3c>;
id = <0>; id = <0>;
}; };
serial@13810000 { serail_1: serial@13810000 {
compatible = "samsung,exynos4210-uart"; compatible = "samsung,exynos4210-uart";
reg = <0x13810000 0x3c>; reg = <0x13810000 0x3c>;
id = <1>; id = <1>;
}; };
serial@13820000 { serial_2: serial@13820000 {
compatible = "samsung,exynos4210-uart"; compatible = "samsung,exynos4210-uart";
reg = <0x13820000 0x3c>; reg = <0x13820000 0x3c>;
id = <2>; id = <2>;
}; };
serial@13830000 { serial_3: serial@13830000 {
compatible = "samsung,exynos4210-uart"; compatible = "samsung,exynos4210-uart";
reg = <0x13830000 0x3c>; reg = <0x13830000 0x3c>;
id = <3>; id = <3>;
}; };
serial@13840000 { serial_4: serial@13840000 {
compatible = "samsung,exynos4210-uart"; compatible = "samsung,exynos4210-uart";
reg = <0x13840000 0x3c>; reg = <0x13840000 0x3c>;
id = <4>; id = <4>;
@ -63,6 +71,7 @@
#size-cells = <0>; #size-cells = <0>;
compatible = "samsung,s3c2440-i2c"; compatible = "samsung,s3c2440-i2c";
reg = <0x13860000 0x100>; reg = <0x13860000 0x100>;
interrupt-parent = <&gic>;
interrupts = <0 56 0>; interrupts = <0 56 0>;
}; };
@ -71,6 +80,7 @@
#size-cells = <0>; #size-cells = <0>;
compatible = "samsung,s3c2440-i2c"; compatible = "samsung,s3c2440-i2c";
reg = <0x13870000 0x100>; reg = <0x13870000 0x100>;
interrupt-parent = <&gic>;
interrupts = <1 57 0>; interrupts = <1 57 0>;
}; };
@ -79,6 +89,7 @@
#size-cells = <0>; #size-cells = <0>;
compatible = "samsung,s3c2440-i2c"; compatible = "samsung,s3c2440-i2c";
reg = <0x13880000 0x100>; reg = <0x13880000 0x100>;
interrupt-parent = <&gic>;
interrupts = <2 58 0>; interrupts = <2 58 0>;
}; };
@ -87,6 +98,7 @@
#size-cells = <0>; #size-cells = <0>;
compatible = "samsung,s3c2440-i2c"; compatible = "samsung,s3c2440-i2c";
reg = <0x13890000 0x100>; reg = <0x13890000 0x100>;
interrupt-parent = <&gic>;
interrupts = <3 59 0>; interrupts = <3 59 0>;
}; };
@ -95,6 +107,7 @@
#size-cells = <0>; #size-cells = <0>;
compatible = "samsung,s3c2440-i2c"; compatible = "samsung,s3c2440-i2c";
reg = <0x138a0000 0x100>; reg = <0x138a0000 0x100>;
interrupt-parent = <&gic>;
interrupts = <4 60 0>; interrupts = <4 60 0>;
}; };
@ -103,6 +116,7 @@
#size-cells = <0>; #size-cells = <0>;
compatible = "samsung,s3c2440-i2c"; compatible = "samsung,s3c2440-i2c";
reg = <0x138b0000 0x100>; reg = <0x138b0000 0x100>;
interrupt-parent = <&gic>;
interrupts = <5 61 0>; interrupts = <5 61 0>;
}; };
@ -111,6 +125,7 @@
#size-cells = <0>; #size-cells = <0>;
compatible = "samsung,s3c2440-i2c"; compatible = "samsung,s3c2440-i2c";
reg = <0x138c0000 0x100>; reg = <0x138c0000 0x100>;
interrupt-parent = <&gic>;
interrupts = <6 62 0>; interrupts = <6 62 0>;
}; };
@ -119,6 +134,7 @@
#size-cells = <0>; #size-cells = <0>;
compatible = "samsung,s3c2440-i2c"; compatible = "samsung,s3c2440-i2c";
reg = <0x138d0000 0x100>; reg = <0x138d0000 0x100>;
interrupt-parent = <&gic>;
interrupts = <7 63 0>; interrupts = <7 63 0>;
}; };
@ -127,6 +143,7 @@
#size-cells = <0>; #size-cells = <0>;
compatible = "samsung,exynos4412-sdhci"; compatible = "samsung,exynos4412-sdhci";
reg = <0x12510000 0x1000>; reg = <0x12510000 0x1000>;
interrupt-parent = <&gic>;
interrupts = <0 75 0>; interrupts = <0 75 0>;
status = "disabled"; status = "disabled";
}; };
@ -136,6 +153,7 @@
#size-cells = <0>; #size-cells = <0>;
compatible = "samsung,exynos4412-sdhci"; compatible = "samsung,exynos4412-sdhci";
reg = <0x12520000 0x1000>; reg = <0x12520000 0x1000>;
interrupt-parent = <&gic>;
interrupts = <0 76 0>; interrupts = <0 76 0>;
status = "disabled"; status = "disabled";
}; };
@ -145,6 +163,7 @@
#size-cells = <0>; #size-cells = <0>;
compatible = "samsung,exynos4412-sdhci"; compatible = "samsung,exynos4412-sdhci";
reg = <0x12530000 0x1000>; reg = <0x12530000 0x1000>;
interrupt-parent = <&gic>;
interrupts = <0 77 0>; interrupts = <0 77 0>;
status = "disabled"; status = "disabled";
}; };
@ -154,6 +173,7 @@
#size-cells = <0>; #size-cells = <0>;
compatible = "samsung,exynos4412-sdhci"; compatible = "samsung,exynos4412-sdhci";
reg = <0x12540000 0x1000>; reg = <0x12540000 0x1000>;
interrupt-parent = <&gic>;
interrupts = <0 78 0>; interrupts = <0 78 0>;
status = "disabled"; status = "disabled";
}; };
@ -163,6 +183,7 @@
#size-cells = <0>; #size-cells = <0>;
compatible = "samsung,exynos4412-dw-mshc"; compatible = "samsung,exynos4412-dw-mshc";
reg = <0x12550000 0x1000>; reg = <0x12550000 0x1000>;
interrupt-parent = <&gic>;
interrupts = <0 131 0>; interrupts = <0 131 0>;
status = "disabled"; status = "disabled";
}; };

20
arch/arm/dts/exynos4210.dtsi
View File

@ -41,14 +41,6 @@
cpu-offset = <0x8000>; cpu-offset = <0x8000>;
}; };
combiner: interrupt-controller@10440000 {
samsung,combiner-nr = <16>;
interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>,
<0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>,
<0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>,
<0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>;
};
mct@10050000 { mct@10050000 {
compatible = "samsung,exynos4210-mct"; compatible = "samsung,exynos4210-mct";
reg = <0x10050000 0x800>; reg = <0x10050000 0x800>;
@ -85,12 +77,14 @@
pinctrl_0: pinctrl@11400000 { pinctrl_0: pinctrl@11400000 {
compatible = "samsung,exynos4210-pinctrl"; compatible = "samsung,exynos4210-pinctrl";
reg = <0x11400000 0x1000>; reg = <0x11400000 0x1000>;
interrupt-parent = <&gic>;
interrupts = <0 47 0>; interrupts = <0 47 0>;
}; };
pinctrl_1: pinctrl@11000000 { pinctrl_1: pinctrl@11000000 {
compatible = "samsung,exynos4210-pinctrl"; compatible = "samsung,exynos4210-pinctrl";
reg = <0x11000000 0x1000>; reg = <0x11000000 0x1000>;
interrupt-parent = <&gic>;
interrupts = <0 46 0>; interrupts = <0 46 0>;
wakup_eint: wakeup-interrupt-controller { wakup_eint: wakeup-interrupt-controller {
@ -118,6 +112,7 @@
g2d@12800000 { g2d@12800000 {
compatible = "samsung,s5pv210-g2d"; compatible = "samsung,s5pv210-g2d";
reg = <0x12800000 0x1000>; reg = <0x12800000 0x1000>;
interrupt-parent = <&gic>;
interrupts = <0 89 0>; interrupts = <0 89 0>;
clocks = <&clock 177>, <&clock 277>; clocks = <&clock 177>, <&clock 277>;
clock-names = "sclk_fimg2d", "fimg2d"; clock-names = "sclk_fimg2d", "fimg2d";
@ -154,3 +149,12 @@
}; };
}; };
}; };
&combiner {
samsung,combiner-nr = <16>;
interrupt-parent = <&gic>;
interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>,
<0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>,
<0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>,
<0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>;
};

55
arch/arm/dts/exynos4412-odroid.dts
View File

@ -15,28 +15,42 @@
compatible = "samsung,odroid", "samsung,exynos4412"; compatible = "samsung,odroid", "samsung,exynos4412";
aliases { aliases {
i2c0 = "/i2c@13860000";
i2c1 = "/i2c@13870000";
i2c2 = "/i2c@13880000";
i2c3 = "/i2c@13890000";
i2c4 = "/i2c@138a0000";
i2c5 = "/i2c@138b0000";
i2c6 = "/i2c@138c0000";
i2c7 = "/i2c@138d0000";
serial0 = "/serial@13800000"; serial0 = "/serial@13800000";
console = "/serial@13810000"; console = "/serial@13810000";
mmc0 = &mshc_0; mmc0 = &mshc_0;
mmc1 = &sdhci2; mmc1 = &sdhci2;
}; };
i2c@13860000 { serial@13810000 {
status = "okay";
};
ehci@12580000 {
compatible = "samsung,exynos-ehci";
reg = <0x12580000 0x100>;
#address-cells = <1>;
#size-cells = <1>;
phy {
compatible = "samsung,exynos-usb-phy";
reg = <0x125B0000 0x100>;
};
};
emmc-reset {
compatible = "samsung,emmc-reset";
reset-gpio = <&gpk1 2 0>;
};
};
&i2c_0 {
samsung,i2c-sda-delay = <100>; samsung,i2c-sda-delay = <100>;
samsung,i2c-slave-addr = <0x10>; samsung,i2c-slave-addr = <0x10>;
samsung,i2c-max-bus-freq = <100000>; samsung,i2c-max-bus-freq = <100000>;
status = "okay"; status = "okay";
max77686_pmic@09 { max77686: max77686_pmic@09 {
compatible = "maxim,max77686"; compatible = "maxim,max77686";
interrupt-parent = <&gpx3>;
interrupts = <7 0>; interrupts = <7 0>;
reg = <0x09 0 0>; reg = <0x09 0 0>;
#clock-cells = <1>; #clock-cells = <1>;
@ -218,27 +232,6 @@
}; };
}; };
}; };
};
serial@13810000 {
status = "okay";
};
ehci@12580000 {
compatible = "samsung,exynos-ehci";
reg = <0x12580000 0x100>;
#address-cells = <1>;
#size-cells = <1>;
phy {
compatible = "samsung,exynos-usb-phy";
reg = <0x125B0000 0x100>;
};
};
emmc-reset {
compatible = "samsung,emmc-reset";
reset-gpio = <&gpk1 2 0>;
};
}; };
&sdhci2 { &sdhci2 {

159
arch/arm/dts/exynos4412-trats2.dts
View File

@ -19,14 +19,6 @@
}; };
aliases { aliases {
i2c0 = "/i2c@13860000";
i2c1 = "/i2c@13870000";
i2c2 = "/i2c@13880000";
i2c3 = "/i2c@13890000";
i2c4 = "/i2c@138a0000";
i2c5 = "/i2c@138b0000";
i2c6 = "/i2c@138c0000";
i2c7 = "/i2c@138d0000";
i2c8 = &i2c_fg; i2c8 = &i2c_fg;
i2c9 = &i2c_max77693; i2c9 = &i2c_max77693;
serial0 = "/serial@13800000"; serial0 = "/serial@13800000";
@ -51,14 +43,88 @@
status = "okay"; status = "okay";
}; };
i2c@138d0000 { fimd@11c00000 {
compatible = "samsung,exynos-fimd";
reg = <0x11c00000 0xa4>;
samsung,vl-freq = <60>;
samsung,vl-col = <720>;
samsung,vl-row = <1280>;
samsung,vl-width = <720>;
samsung,vl-height = <1280>;
samsung,vl-clkp = <0>;
samsung,vl-oep = <0>;
samsung,vl-hsp = <1>;
samsung,vl-vsp = <1>;
samsung,vl-dp = <1>;
samsung,vl-bpix = <4>;
samsung,vl-hspw = <5>;
samsung,vl-hbpd = <10>;
samsung,vl-hfpd = <10>;
samsung,vl-vspw = <2>;
samsung,vl-vbpd = <1>;
samsung,vl-vfpd = <13>;
samsung,vl-cmd-allow-len = <0xf>;
samsung,winid = <0>;
samsung,power-on-delay = <30>;
samsung,interface-mode = <1>;
samsung,mipi-enabled = <1>;
samsung,dp-enabled;
samsung,dual-lcd-enabled;
samsung,logo-on = <1>;
samsung,resolution = <0>;
samsung,rgb-mode = <0>;
};
mipidsi@11c80000 {
compatible = "samsung,exynos-mipi-dsi";
reg = <0x11c80000 0x5c>;
samsung,dsim-config-e-interface = <1>;
samsung,dsim-config-e-virtual-ch = <0>;
samsung,dsim-config-e-pixel-format = <7>;
samsung,dsim-config-e-burst-mode = <1>;
samsung,dsim-config-e-no-data-lane = <3>;
samsung,dsim-config-e-byte-clk = <0>;
samsung,dsim-config-hfp = <1>;
samsung,dsim-config-p = <3>;
samsung,dsim-config-m = <120>;
samsung,dsim-config-s = <1>;
samsung,dsim-config-pll-stable-time = <500>;
samsung,dsim-config-esc-clk = <20000000>;
samsung,dsim-config-stop-holding-cnt = <0x7ff>;
samsung,dsim-config-bta-timeout = <0xff>;
samsung,dsim-config-rx-timeout = <0xffff>;
samsung,dsim-device-id = <0xffffffff>;
samsung,dsim-device-bus-id = <0>;
samsung,dsim-device-reverse-panel = <1>;
};
sdhci@12510000 {
samsung,bus-width = <8>;
samsung,timing = <1 3 3>;
pwr-gpios = <&gpk0 4 0>;
status = "disabled";
};
};
&i2c_7 {
samsung,i2c-sda-delay = <100>; samsung,i2c-sda-delay = <100>;
samsung,i2c-slave-addr = <0x10>; samsung,i2c-slave-addr = <0x10>;
samsung,i2c-max-bus-freq = <100000>; samsung,i2c-max-bus-freq = <100000>;
status = "okay"; status = "okay";
max77686_pmic@09 { max77686: max77686_pmic@09 {
compatible = "maxim,max77686"; compatible = "maxim,max77686";
interrupt-parent = <&gpx0>;
interrupts = <7 0>; interrupts = <7 0>;
reg = <0x09 0 0>; reg = <0x09 0 0>;
#clock-cells = <1>; #clock-cells = <1>;
@ -363,79 +429,6 @@
}; };
}; };
}; };
};
fimd@11c00000 {
compatible = "samsung,exynos-fimd";
reg = <0x11c00000 0xa4>;
samsung,vl-freq = <60>;
samsung,vl-col = <720>;
samsung,vl-row = <1280>;
samsung,vl-width = <720>;
samsung,vl-height = <1280>;
samsung,vl-clkp = <0>;
samsung,vl-oep = <0>;
samsung,vl-hsp = <1>;
samsung,vl-vsp = <1>;
samsung,vl-dp = <1>;
samsung,vl-bpix = <4>;
samsung,vl-hspw = <5>;
samsung,vl-hbpd = <10>;
samsung,vl-hfpd = <10>;
samsung,vl-vspw = <2>;
samsung,vl-vbpd = <1>;
samsung,vl-vfpd = <13>;
samsung,vl-cmd-allow-len = <0xf>;
samsung,winid = <0>;
samsung,power-on-delay = <30>;
samsung,interface-mode = <1>;
samsung,mipi-enabled = <1>;
samsung,dp-enabled;
samsung,dual-lcd-enabled;
samsung,logo-on = <1>;
samsung,resolution = <0>;
samsung,rgb-mode = <0>;
};
mipidsi@11c80000 {
compatible = "samsung,exynos-mipi-dsi";
reg = <0x11c80000 0x5c>;
samsung,dsim-config-e-interface = <1>;
samsung,dsim-config-e-virtual-ch = <0>;
samsung,dsim-config-e-pixel-format = <7>;
samsung,dsim-config-e-burst-mode = <1>;
samsung,dsim-config-e-no-data-lane = <3>;
samsung,dsim-config-e-byte-clk = <0>;
samsung,dsim-config-hfp = <1>;
samsung,dsim-config-p = <3>;
samsung,dsim-config-m = <120>;
samsung,dsim-config-s = <1>;
samsung,dsim-config-pll-stable-time = <500>;
samsung,dsim-config-esc-clk = <20000000>;
samsung,dsim-config-stop-holding-cnt = <0x7ff>;
samsung,dsim-config-bta-timeout = <0xff>;
samsung,dsim-config-rx-timeout = <0xffff>;
samsung,dsim-device-id = <0xffffffff>;
samsung,dsim-device-bus-id = <0>;
samsung,dsim-device-reverse-panel = <1>;
};
sdhci@12510000 {
samsung,bus-width = <8>;
samsung,timing = <1 3 3>;
pwr-gpios = <&gpk0 4 0>;
status = "disabled";
};
}; };
&sdhci0 { &sdhci0 {

10
arch/arm/dts/exynos4412.dtsi
View File

@ -21,18 +21,14 @@
/ { / {
compatible = "samsung,exynos4412"; compatible = "samsung,exynos4412";
};
gic: interrupt-controller@10490000 { &combiner {
cpu-offset = <0x4000>;
};
interrupt-controller@10440000 {
samsung,combiner-nr = <20>; samsung,combiner-nr = <20>;
interrupt-parent = <&gic>;
interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>, interrupts = <0 0 0>, <0 1 0>, <0 2 0>, <0 3 0>,
<0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>, <0 4 0>, <0 5 0>, <0 6 0>, <0 7 0>,
<0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>, <0 8 0>, <0 9 0>, <0 10 0>, <0 11 0>,
<0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>, <0 12 0>, <0 13 0>, <0 14 0>, <0 15 0>,
<0 107 0>, <0 108 0>, <0 48 0>, <0 42 0>; <0 107 0>, <0 108 0>, <0 48 0>, <0 42 0>;
};
}; };

4
arch/arm/dts/exynos4x12.dtsi
View File

@ -63,12 +63,14 @@
pinctrl_0: pinctrl@11400000 { pinctrl_0: pinctrl@11400000 {
compatible = "samsung,exynos4x12-pinctrl"; compatible = "samsung,exynos4x12-pinctrl";
reg = <0x11400000 0x1000>; reg = <0x11400000 0x1000>;
interrupt-parent = <&gic>;
interrupts = <0 47 0>; interrupts = <0 47 0>;
}; };
pinctrl_1: pinctrl@11000000 { pinctrl_1: pinctrl@11000000 {
compatible = "samsung,exynos4x12-pinctrl"; compatible = "samsung,exynos4x12-pinctrl";
reg = <0x11000000 0x1000>; reg = <0x11000000 0x1000>;
interrupt-parent = <&gic>;
interrupts = <0 46 0>; interrupts = <0 46 0>;
wakup_eint: wakeup-interrupt-controller { wakup_eint: wakeup-interrupt-controller {
@ -88,12 +90,14 @@
pinctrl_3: pinctrl@106E0000 { pinctrl_3: pinctrl@106E0000 {
compatible = "samsung,exynos4x12-pinctrl"; compatible = "samsung,exynos4x12-pinctrl";
reg = <0x106E0000 0x1000>; reg = <0x106E0000 0x1000>;
interrupt-parent = <&gic>;
interrupts = <0 72 0>; interrupts = <0 72 0>;
}; };
g2d@10800000 { g2d@10800000 {
compatible = "samsung,exynos4212-g2d"; compatible = "samsung,exynos4212-g2d";
reg = <0x10800000 0x1000>; reg = <0x10800000 0x1000>;
interrupt-parent = <&gic>;
interrupts = <0 89 0>; interrupts = <0 89 0>;
clocks = <&clock 177>, <&clock 277>; clocks = <&clock 177>, <&clock 277>;
clock-names = "sclk_fimg2d", "fimg2d"; clock-names = "sclk_fimg2d", "fimg2d";

27
board/samsung/common/exynos5-dt-types.c
View File

@ -25,17 +25,22 @@ static const struct udevice_id board_ids[] = {
}; };
/** /**
* Odroix XU3/4 board revisions: * Odroix XU3/XU4/HC1 board revisions (from HC1_MAIN_REV0.1_20170630.pdf):
* Rev ADCmax Board * Rev ADCmax Board
* 0.1 0 XU3 0.1 * 0.1 0 XU3 0.1
* 0.2 410 XU3 0.2 | XU3L - no DISPLAYPORT (probe I2C0:0x40 / INA231) * 0.2 372 XU3 0.2 | XU3L - no DISPLAYPORT (probe I2C0:0x40 / INA231)
* 0.3 1408 XU4 0.1 * 0.3 1280 XU4 0.1
* Use +10 % for ADC value tolerance. * 0.4 739 XU4 0.2
* 0.5 1016 XU4+Air0.1 (Passive cooling)
* 0.6 1308 XU4S 0.1 (HC1)
* Use +1% for ADC value tolerance in the array below, the code loops until
* the measured ADC value is lower than then ADCmax from the array.
*/ */
struct odroid_rev_info odroid_info[] = { struct odroid_rev_info odroid_info[] = {
{ EXYNOS5_BOARD_ODROID_XU3_REV01, 1, 10, "xu3" }, { EXYNOS5_BOARD_ODROID_XU3_REV01, 1, 10, "xu3" },
{ EXYNOS5_BOARD_ODROID_XU3_REV02, 2, 410, "xu3" }, { EXYNOS5_BOARD_ODROID_XU3_REV02, 2, 375, "xu3" },
{ EXYNOS5_BOARD_ODROID_XU4_REV01, 1, 1408, "xu4" }, { EXYNOS5_BOARD_ODROID_XU4_REV01, 1, 1293, "xu4" },
{ EXYNOS5_BOARD_ODROID_HC1_REV01, 1, 1321, "hc1" },
{ EXYNOS5_BOARD_ODROID_UNKNOWN, 0, 4095, "unknown" }, { EXYNOS5_BOARD_ODROID_UNKNOWN, 0, 4095, "unknown" },
}; };
@ -61,7 +66,7 @@ static int odroid_get_board_type(void)
goto rev_default; goto rev_default;
for (i = 0; i < ARRAY_SIZE(odroid_info); i++) { for (i = 0; i < ARRAY_SIZE(odroid_info); i++) {
/* ADC tolerance: +20 % */ /* ADC tolerance: +1% */
if (adcval < odroid_info[i].adc_val) if (adcval < odroid_info[i].adc_val)
return odroid_info[i].board_type; return odroid_info[i].board_type;
} }
@ -132,6 +137,14 @@ bool board_is_odroidxu4(void)
return false; return false;
} }
bool board_is_odroidhc1(void)
{
if (gd->board_type == EXYNOS5_BOARD_ODROID_HC1_REV01)
return true;
return false;
}
bool board_is_generic(void) bool board_is_generic(void)
{ {
if (gd->board_type == EXYNOS5_BOARD_GENERIC) if (gd->board_type == EXYNOS5_BOARD_GENERIC)

4
board/samsung/common/exynos5-dt.c
View File

@ -176,7 +176,7 @@ char *get_dfu_alt_system(char *interface, char *devstr)
{ {
char *info = "Not supported!"; char *info = "Not supported!";
if (board_is_odroidxu4()) if (board_is_odroidxu4() || board_is_odroidhc1())
return info; return info;
return env_get("dfu_alt_system"); return env_get("dfu_alt_system");
@ -189,7 +189,7 @@ char *get_dfu_alt_boot(char *interface, char *devstr)
char *alt_boot; char *alt_boot;
int dev_num; int dev_num;
if (board_is_odroidxu4()) if (board_is_odroidxu4() || board_is_odroidhc1())
return info; return info;
dev_num = simple_strtoul(devstr, NULL, 10); dev_num = simple_strtoul(devstr, NULL, 10);

2
configs/odroid-xu3_defconfig
View File

@ -1,7 +1,7 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_EXYNOS=y CONFIG_ARCH_EXYNOS=y
CONFIG_ARCH_EXYNOS5=y CONFIG_ARCH_EXYNOS5=y
CONFIG_IDENT_STRING=" for ODROID-XU3" CONFIG_IDENT_STRING=" for ODROID-XU3/XU4/HC1"
CONFIG_DEFAULT_DEVICE_TREE="exynos5422-odroidxu3" CONFIG_DEFAULT_DEVICE_TREE="exynos5422-odroidxu3"
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set

2
include/samsung/exynos5-dt-types.h
View File

@ -8,6 +8,7 @@ enum {
EXYNOS5_BOARD_ODROID_XU3_REV01, EXYNOS5_BOARD_ODROID_XU3_REV01,
EXYNOS5_BOARD_ODROID_XU3_REV02, EXYNOS5_BOARD_ODROID_XU3_REV02,
EXYNOS5_BOARD_ODROID_XU4_REV01, EXYNOS5_BOARD_ODROID_XU4_REV01,
EXYNOS5_BOARD_ODROID_HC1_REV01,
EXYNOS5_BOARD_ODROID_UNKNOWN, EXYNOS5_BOARD_ODROID_UNKNOWN,
EXYNOS5_BOARD_COUNT, EXYNOS5_BOARD_COUNT,
@ -23,5 +24,6 @@ struct odroid_rev_info {
bool board_is_generic(void); bool board_is_generic(void);
bool board_is_odroidxu3(void); bool board_is_odroidxu3(void);
bool board_is_odroidxu4(void); bool board_is_odroidxu4(void);
bool board_is_odroidhc1(void);
#endif #endif