p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

SoCFPGA DTS updates for v4.13 

- Fix clocks node the EMACs
 - VINING board updtes
 	- Remove I2C EEPROMs and LED node
 	- Add QSPI device
 	- Add 2nd ethernet alias
 - Add 'clock-frequency' binding for i2c node
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJZTSdFAAoJEBmUBAuBoyj0eYcP/2ptr68NC796MXyErFlmLxq5
 epFhEdgyALngSGaXHdbZJDjk8VWPA2Ua9H/6xIGVrm9tUc4BVSHECR5XSXVdRI3f
 XUJHBW1K88l74ghffVHaW9IGts8mcNWEhttjEA1qnhyF/qjQu6KZx6tl/xKCvKCa
 TEl/UvpJPiu0M/tzHepQ5J7p2LYsS/vR3N4wouuGEfWlD/DTDdadoaiyg7RlFBvj
 fBoIFr+vzGgBN8HBNQJCcrCG7XhLHzrvw1EWWMNTzVV73IbYz9w4btouZ+FVoJOu
 Bjs7MAX+A8UW0Wy3gHTTc3Awp9ZF276WxGdcztxciEiZqXmnSyCE3mop8PrH1mij
 BypI38c23t1r0xluSRYWCXF0S4zEV37dug8HXhmjqcEBj7RXeg+IAfQ+UaKI8XvP
 NuFDKd9YsN7Vc1GIIIksm2v9/qzZbjV37PiLq4HNdMA0VaFi0i9hskqXuA9bsNn7
 cycybu46EyxYjjSP5mJuGjZb6MXdcDMSHLTQWwiYllNb5hVUA3zYv7XvSmFRM22n
 73Gt2KBlgxSCtIyMx+vMDXXevPE3l8f4w9yeEk4Av5tv0F8sf5T/iCGdBX9E64Eo
 Y6OAVNoE4/W4DJasGySzy/Di0+rHTOcRNVzkOmJaqNzIfo2IQ0MghZdInkDvZdIW
 neklhVn5pOIelPDrldjq
 =cknj
 -----END PGP SIGNATURE-----

Merge tag 'socfpga_dts_for_v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux into next/dt

Pull "SoCFPGA DTS updates for v4.13" from Dinh Nguyen:

- Fix clocks node the EMACs
- VINING board updtes
	- Remove I2C EEPROMs and LED node
	- Add QSPI device
	- Add 2nd ethernet alias
- Add 'clock-frequency' binding for i2c node

* tag 'socfpga_dts_for_v4.13' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux:
  ARM: dts: socfpga: set the i2c frequency
  ARM: dts: socfpga: Add second ethernet alias to VINING FPGA
  ARM: dts: socfpga: Drop LED node from VINING FPGA
  ARM: dts: socfpga: Remove I2C EEPROMs from VINING FPGA
  ARM: dts: socfpga: Enable QSPI support on VINING FPGA
  ARM: dts: socfpga: Fix the ethernet clock phandle
This commit is contained in:
Arnd Bergmann 2017-06-23 16:44:36 +02:00
parent f61bbd39b4 3c56909ec2
commit 30e3224e4a
5 changed files with 46 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm/boot/dts/socfpga.dtsi
View File

@ -557,7 +557,7 @@ gmac0: ethernet@ff700000 {
interrupts = <0 115 4>;
interrupt-names = "macirq";
mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
clocks = <&emac0_clk>;
clocks = <&emac_0_clk>;
clock-names = "stmmaceth";
resets = <&rst EMAC0_RESET>;
reset-names = "stmmaceth";
@ -575,7 +575,7 @@ gmac1: ethernet@ff702000 {
interrupts = <0 120 4>;
interrupt-names = "macirq";
mac-address = [00 00 00 00 00 00];/* Filled in by U-Boot */
clocks = <&emac1_clk>;
clocks = <&emac_1_clk>;
clock-names = "stmmaceth";
resets = <&rst EMAC1_RESET>;
reset-names = "stmmaceth";

2
arch/arm/boot/dts/socfpga_arria10_socdk.dtsi
View File

@ -130,13 +130,13 @@ a10sr_rst: reset-controller {
};
&i2c1 {
speed-mode = <0>;
status = "okay";
/*
* adjust the falling times to decrease the i2c frequency to 50Khz
* because the LCD module does not work at the standard 100Khz
*/
clock-frequency = <100000>;
i2c-sda-falling-time-ns = <6000>;
i2c-scl-falling-time-ns = <6000>;

2
arch/arm/boot/dts/socfpga_cyclone5_de0_sockit.dts
View File

@ -86,7 +86,7 @@ &gpio2 {
&i2c0 {
status = "okay";
speed-mode = <0>;
clock-frequency = <100000>;
adxl345: adxl345@0 {
compatible = "adi,adxl345";

2
arch/arm/boot/dts/socfpga_cyclone5_mcvevk.dts
View File

@ -58,7 +58,7 @@ &gpio2 { /* GPIO 58..66 (HLGPI 0..13 at offset 13) */
&i2c0 {
status = "okay";
speed-mode = <0>;
clock-frequency = <100000>;
stmpe1: stmpe811@41 {
compatible = "st,stmpe811";

101
arch/arm/boot/dts/socfpga_cyclone5_vining_fpga.dts
View File

@ -69,34 +69,7 @@ aliases {
* to be added to the gmac1 device tree blob.
*/
ethernet0 = &gmac1;
};
leds {
compatible = "gpio-leds";
hps_led0 {
label = "hps:green:led0"; /* ALIVE_LED_GR */
gpios = <&portb 19 0>; /* HPS_GPIO48 */
linux,default-trigger = "heartbeat";
};
hps_led1 {
label = "hps:red:led0"; /* ALIVE_LED_RD */
gpios = <&portb 24 0>; /* HPS_GPIO53 */
linux,default-trigger = "none";
};
hps_led2 {
label = "hps:green:led1"; /* LINK2HOST_LED_GR */
gpios = <&portb 25 0>; /* HPS_GPIO54 */
linux,default-trigger = "heartbeat";
};
hps_led3 {
label = "hps:red:led1"; /* LINK2HOST_LED_RD */
gpios = <&portc 7 0>; /* HPS_GPIO65 */
linux,default-trigger = "none";
};
ethernet1 = &gmac0;
};
gpio-keys {
@ -203,69 +176,39 @@ i2c@0 {
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
eeprom@51 {
compatible = "at,24c01";
pagesize = <8>;
reg = <0x51>;
};
};
i2c@1 {
#address-cells = <1>;
#size-cells = <0>;
reg = <1>;
eeprom@51 {
compatible = "at,24c01";
pagesize = <8>;
reg = <0x51>;
};
};
i2c@2 {
#address-cells = <1>;
#size-cells = <0>;
reg = <2>;
eeprom@51 {
compatible = "at,24c01";
pagesize = <8>;
reg = <0x51>;
};
};
i2c@3 {
#address-cells = <1>;
#size-cells = <0>;
reg = <3>;
eeprom@51 {
compatible = "at,24c01";
pagesize = <8>;
reg = <0x51>;
};
};
i2c@4 {
#address-cells = <1>;
#size-cells = <0>;
reg = <4>;
eeprom@51 {
compatible = "at,24c01";
pagesize = <8>;
reg = <0x51>;
};
};
i2c@5 {
#address-cells = <1>;
#size-cells = <0>;
reg = <5>;
eeprom@51 {
compatible = "at,24c01";
pagesize = <8>;
reg = <0x51>;
};
};
i2c@6 {
i2c@6 { /* Backplane EEPROM */
#address-cells = <1>;
#size-cells = <0>;
reg = <6>;
@ -276,7 +219,7 @@ eeprom@51 {
};
};
i2c@7 {
i2c@7 { /* Power board EEPROM */
#address-cells = <1>;
#size-cells = <0>;
reg = <7>;
@ -300,6 +243,44 @@ at24@50 {
};
};
&qspi {
status = "okay";
n25q128@0 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "n25q128";
reg = <0>; /* chip select */
spi-max-frequency = <100000000>;
m25p,fast-read;
cdns,page-size = <256>;
cdns,block-size = <16>;
cdns,read-delay = <4>;
cdns,tshsl-ns = <50>;
cdns,tsd2d-ns = <50>;
cdns,tchsh-ns = <4>;
cdns,tslch-ns = <4>;
};
n25q00@1 {
#address-cells = <1>;
#size-cells = <1>;
compatible = "n25q00";
reg = <1>; /* chip select */
spi-max-frequency = <100000000>;
m25p,fast-read;
cdns,page-size = <256>;
cdns,block-size = <16>;
cdns,read-delay = <4>;
cdns,tshsl-ns = <50>;
cdns,tsd2d-ns = <50>;
cdns,tchsh-ns = <4>;
cdns,tslch-ns = <4>;
};
};
&usb0 {
dr_mode = "host";
status = "okay";