diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-01-11 16:20:46 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-01-11 16:20:46 +0100 |
| commit | 2ab5d62d038d22f343e472a406d113706915f5c1 (patch) | |
| tree | 3a54748bf06cf976cd039cecb9e95e740d6d5e91 /dts/src/arm64/rockchip | |
| parent | 17fa36cd7d892cd083c1978a88a0f1de85264ee6 (diff) | |
| download | barebox-2ab5d62d038d22f343e472a406d113706915f5c1.tar.gz barebox-2ab5d62d038d22f343e472a406d113706915f5c1.tar.xz | |
dts: update to v4.15-rc7
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src/arm64/rockchip')
| -rw-r--r-- | dts/src/arm64/rockchip/rk3328-rock64.dts | 2 | ||||
| -rw-r--r-- | dts/src/arm64/rockchip/rk3328.dtsi | 2 | ||||
| -rw-r--r-- | dts/src/arm64/rockchip/rk3399-puma.dtsi | 11 |
3 files changed, 3 insertions, 12 deletions
diff --git a/dts/src/arm64/rockchip/rk3328-rock64.dts b/dts/src/arm64/rockchip/rk3328-rock64.dts index d4f80786e7..3890468678 100644 --- a/dts/src/arm64/rockchip/rk3328-rock64.dts +++ b/dts/src/arm64/rockchip/rk3328-rock64.dts @@ -132,6 +132,8 @@ assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>; assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>; clock_in_out = "input"; + /* shows instability at 1GBit right now */ + max-speed = <100>; phy-supply = <&vcc_io>; phy-mode = "rgmii"; pinctrl-names = "default"; diff --git a/dts/src/arm64/rockchip/rk3328.dtsi b/dts/src/arm64/rockchip/rk3328.dtsi index 41d61840fb..2426da6319 100644 --- a/dts/src/arm64/rockchip/rk3328.dtsi +++ b/dts/src/arm64/rockchip/rk3328.dtsi @@ -514,7 +514,7 @@ tsadc: tsadc@ff250000 { compatible = "rockchip,rk3328-tsadc"; reg = <0x0 0xff250000 0x0 0x100>; - interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH 0>; + interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>; assigned-clocks = <&cru SCLK_TSADC>; assigned-clock-rates = <50000>; clocks = <&cru SCLK_TSADC>, <&cru PCLK_TSADC>; diff --git a/dts/src/arm64/rockchip/rk3399-puma.dtsi b/dts/src/arm64/rockchip/rk3399-puma.dtsi index 910628d18a..1fc5060d70 100644 --- a/dts/src/arm64/rockchip/rk3399-puma.dtsi +++ b/dts/src/arm64/rockchip/rk3399-puma.dtsi @@ -155,17 +155,6 @@ regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; }; - - vdd_log: vdd-log { - compatible = "pwm-regulator"; - pwms = <&pwm2 0 25000 0>; - regulator-name = "vdd_log"; - regulator-min-microvolt = <800000>; - regulator-max-microvolt = <1400000>; - regulator-always-on; - regulator-boot-on; - status = "okay"; - }; }; &cpu_b0 { |