Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: rockchip: move the public part to rk3288-evb common

Rk3288-evb-act8846 and rk3288-evb-rk808 are the power boards of
rk3288-evb, they provide the same power supply interface to the
motherboard. Sort out them, put the public part to rk3288-evb.dtsi,
such as gmac and cpu-supply, leaving only the power section.

Signed-off-by: Chris Zhong <zyw@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>

authored by

Chris Zhong and committed by
Heiko Stuebner
b04061e6 662513a1

+32 -36
-4
arch/arm/boot/dts/rk3288-evb-act8846.dts
··· 65 65 }; 66 66 }; 67 67 68 - &cpu0 { 69 - cpu0-supply = <&vdd_cpu>; 70 - }; 71 - 72 68 &i2c0 { 73 69 clock-frequency = <400000>; 74 70
-27
arch/arm/boot/dts/rk3288-evb-rk808.dts
··· 43 43 44 44 / { 45 45 compatible = "rockchip,rk3288-evb-rk808", "rockchip,rk3288"; 46 - 47 - ext_gmac: external-gmac-clock { 48 - compatible = "fixed-clock"; 49 - clock-frequency = <125000000>; 50 - clock-output-names = "ext_gmac"; 51 - #clock-cells = <0>; 52 - }; 53 - }; 54 - 55 - &cpu0 { 56 - cpu0-supply = <&vdd_cpu>; 57 46 }; 58 47 59 48 &i2c0 { ··· 232 243 }; 233 244 }; 234 245 }; 235 - }; 236 - 237 - &gmac { 238 - phy-supply = <&vcc_phy>; 239 - phy-mode = "rgmii"; 240 - clock_in_out = "input"; 241 - snps,reset-gpio = <&gpio4 7 0>; 242 - snps,reset-active-low; 243 - snps,reset-delays-us = <0 10000 1000000>; 244 - assigned-clocks = <&cru SCLK_MAC>; 245 - assigned-clock-parents = <&ext_gmac>; 246 - pinctrl-names = "default"; 247 - pinctrl-0 = <&rgmii_pins>; 248 - tx_delay = <0x30>; 249 - rx_delay = <0x10>; 250 - status = "ok"; 251 246 };
+32 -5
arch/arm/boot/dts/rk3288-evb.dtsi
··· 89 89 pwms = <&pwm0 0 1000000 PWM_POLARITY_INVERTED>; 90 90 }; 91 91 92 + ext_gmac: external-gmac-clock { 93 + compatible = "fixed-clock"; 94 + clock-frequency = <125000000>; 95 + clock-output-names = "ext_gmac"; 96 + #clock-cells = <0>; 97 + }; 98 + 92 99 gpio-keys { 93 100 compatible = "gpio-keys"; 94 101 #address-cells = <1>; ··· 167 160 }; 168 161 }; 169 162 163 + &cpu0 { 164 + cpu0-supply = <&vdd_cpu>; 165 + }; 166 + 170 167 &emmc { 171 168 broken-cd; 172 169 bus-width = <8>; ··· 180 169 num-slots = <1>; 181 170 pinctrl-names = "default"; 182 171 pinctrl-0 = <&emmc_clk &emmc_cmd &emmc_pwr &emmc_bus8>; 183 - status = "okay"; 184 - }; 185 - 186 - &hdmi { 187 - ddc-i2c-bus = <&i2c5>; 188 172 status = "okay"; 189 173 }; 190 174 ··· 195 189 status = "okay"; 196 190 vmmc-supply = <&vcc_sd>; 197 191 vqmmc-supply = <&vccio_sd>; 192 + }; 193 + 194 + &gmac { 195 + phy-supply = <&vcc_phy>; 196 + phy-mode = "rgmii"; 197 + clock_in_out = "input"; 198 + snps,reset-gpio = <&gpio4 7 0>; 199 + snps,reset-active-low; 200 + snps,reset-delays-us = <0 10000 1000000>; 201 + assigned-clocks = <&cru SCLK_MAC>; 202 + assigned-clock-parents = <&ext_gmac>; 203 + pinctrl-names = "default"; 204 + pinctrl-0 = <&rgmii_pins>; 205 + tx_delay = <0x30>; 206 + rx_delay = <0x10>; 207 + status = "ok"; 208 + }; 209 + 210 + &hdmi { 211 + ddc-i2c-bus = <&i2c5>; 212 + status = "okay"; 198 213 }; 199 214 200 215 &i2c0 {