mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-05 19:10:13 +00:00
83f71ef558
Commitff7bd212cb
("net: phy: micrel: fix divisor value for KSZ9031 phy skew") fixed the skew value divisor for the KSZ9031, but left the code using the same divisor for the KSZ9021, which is incorrect. The preceding commitc16e69f702
("net: phy: micrel: add documentation for Micrel KSZ90x1 binding") added the DTS documentation for the KSZ90x1, changing it from the equivalent file in the Linux kernel to correctly state that for this part the skew value is set in 120ps steps, whereas the Linux documentation and driver continue to this day to use the incorrect value of 200 that came from the original KSZ9021 datasheet before it was corrected in revision 1.2 (Feb 2014). This commit sorts out the resulting confusion in a consistent way by making the following changes: - Update the documentation to be clear about what the skew values mean, in the same was as for the KSZ9031. - Update the Micrel PHY driver to select the appropriate divisor for both parts. - Adjust all the device trees that state skew values for KSZ9021 PHYs to use values based on 120ps steps instead of 200ps steps. This will result in the same values being programmed into the skew registers as the equivalent device trees in the Linux kernel do, where it incorrectly uses 200ps steps (since that's where all these device trees were copied from). Signed-off-by: James Byrne <james.byrne@origamienergy.com> Acked-by: Joe Hershberger <joe.hershberger@ni.com>
166 lines
3.3 KiB
Text
166 lines
3.3 KiB
Text
/*
|
|
* sama5d3xcm_cmp.dtsi - Device Tree Include file for SAMA5D36 CMP CPU Module
|
|
*
|
|
* Copyright (C) 2016 Atmel,
|
|
*
|
|
* Licensed under GPLv2 or later.
|
|
*/
|
|
|
|
/ {
|
|
compatible = "atmel,sama5d3xcm", "atmel,sama5d3", "atmel,sama5";
|
|
|
|
chosen {
|
|
bootargs = "rootfstype=ubifs ubi.mtd=5 root=ubi0:rootfs";
|
|
stdout-path = "serial0:115200n8";
|
|
};
|
|
|
|
memory {
|
|
reg = <0x20000000 0x20000000>;
|
|
};
|
|
|
|
clocks {
|
|
slow_xtal {
|
|
clock-frequency = <32768>;
|
|
};
|
|
|
|
main_xtal {
|
|
clock-frequency = <12000000>;
|
|
};
|
|
};
|
|
|
|
ahb {
|
|
apb {
|
|
spi0: spi@f0004000 {
|
|
cs-gpios = <&pioD 13 0>, <0>, <0>, <0>;
|
|
};
|
|
|
|
macb0: ethernet@f0028000 {
|
|
phy-mode = "rgmii";
|
|
#address-cells = <1>;
|
|
#size-cells = <0>;
|
|
|
|
ethernet-phy@1 {
|
|
reg = <0x1>;
|
|
interrupt-parent = <&pioB>;
|
|
interrupts = <25 IRQ_TYPE_EDGE_FALLING>;
|
|
txen-skew-ps = <480>;
|
|
txc-skew-ps = <1800>;
|
|
rxdv-skew-ps = <240>;
|
|
rxc-skew-ps = <1800>;
|
|
rxd0-skew-ps = <240>;
|
|
rxd1-skew-ps = <240>;
|
|
rxd2-skew-ps = <240>;
|
|
rxd3-skew-ps = <240>;
|
|
};
|
|
|
|
ethernet-phy@7 {
|
|
reg = <0x7>;
|
|
interrupt-parent = <&pioB>;
|
|
interrupts = <25 IRQ_TYPE_EDGE_FALLING>;
|
|
txen-skew-ps = <480>;
|
|
txc-skew-ps = <1800>;
|
|
rxdv-skew-ps = <240>;
|
|
rxc-skew-ps = <1800>;
|
|
rxd0-skew-ps = <240>;
|
|
rxd1-skew-ps = <240>;
|
|
rxd2-skew-ps = <240>;
|
|
rxd3-skew-ps = <240>;
|
|
};
|
|
};
|
|
|
|
i2c1: i2c@f0018000 {
|
|
pmic: act8865@5b {
|
|
compatible = "active-semi,act8865";
|
|
reg = <0x5b>;
|
|
status = "disabled";
|
|
|
|
regulators {
|
|
vcc_1v8_reg: DCDC_REG1 {
|
|
regulator-name = "VCC_1V8";
|
|
regulator-min-microvolt = <1800000>;
|
|
regulator-max-microvolt = <1800000>;
|
|
regulator-always-on;
|
|
};
|
|
|
|
vcc_1v2_reg: DCDC_REG2 {
|
|
regulator-name = "VCC_1V2";
|
|
regulator-min-microvolt = <1100000>;
|
|
regulator-max-microvolt = <1300000>;
|
|
regulator-always-on;
|
|
};
|
|
|
|
vcc_3v3_reg: DCDC_REG3 {
|
|
regulator-name = "VCC_3V3";
|
|
regulator-min-microvolt = <3300000>;
|
|
regulator-max-microvolt = <3300000>;
|
|
regulator-always-on;
|
|
};
|
|
|
|
vddana_reg: LDO_REG1 {
|
|
regulator-name = "VDDANA";
|
|
regulator-min-microvolt = <3300000>;
|
|
regulator-max-microvolt = <3300000>;
|
|
regulator-always-on;
|
|
};
|
|
|
|
vddfuse_reg: LDO_REG2 {
|
|
regulator-name = "FUSE_2V5";
|
|
regulator-min-microvolt = <2500000>;
|
|
regulator-max-microvolt = <2500000>;
|
|
};
|
|
};
|
|
};
|
|
};
|
|
};
|
|
|
|
nand0: nand@60000000 {
|
|
nand-bus-width = <8>;
|
|
nand-ecc-mode = "hw";
|
|
atmel,has-pmecc;
|
|
atmel,pmecc-cap = <4>;
|
|
atmel,pmecc-sector-size = <512>;
|
|
nand-on-flash-bbt;
|
|
status = "okay";
|
|
|
|
at91bootstrap@0 {
|
|
label = "at91bootstrap";
|
|
reg = <0x0 0x40000>;
|
|
};
|
|
|
|
bootloader@40000 {
|
|
label = "bootloader";
|
|
reg = <0x40000 0x80000>;
|
|
};
|
|
|
|
bootloaderenv@c0000 {
|
|
label = "bootloader env";
|
|
reg = <0xc0000 0xc0000>;
|
|
};
|
|
|
|
dtb@180000 {
|
|
label = "device tree";
|
|
reg = <0x180000 0x80000>;
|
|
};
|
|
|
|
kernel@200000 {
|
|
label = "kernel";
|
|
reg = <0x200000 0x600000>;
|
|
};
|
|
|
|
rootfs@800000 {
|
|
label = "rootfs";
|
|
reg = <0x800000 0x0f800000>;
|
|
};
|
|
};
|
|
};
|
|
|
|
leds {
|
|
compatible = "gpio-leds";
|
|
|
|
d2 {
|
|
label = "d2";
|
|
gpios = <&pioE 25 GPIO_ACTIVE_LOW>; /* PE25, conflicts with A25, RXD2 */
|
|
linux,default-trigger = "heartbeat";
|
|
};
|
|
};
|
|
};
|