| Message ID | 1496447559-19782-2-git-send-email-thor.thayer@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi! thor.thayer@linux.intel.com writes: > From: Thor Thayer <thor.thayer@linux.intel.com> > > Add the Altera I2C Controller to the CycloneV SoCFPGA device tree. > > Signed-off-by: Thor Thayer <thor.thayer@linux.intel.com> > --- > v2 Remove altr, from fifo-size. > Rename compatible string to "altr,softip-i2c" > v3 Add version to commpatible string "altr,softip-i2c-v1.0" > --- > arch/arm/boot/dts/socfpga.dtsi | 13 ++++++++++--- > arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 28 +++++++++++++++++++++++++++- > 2 files changed, 37 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi > index b2674bd..d69c13d 100644 > --- a/arch/arm/boot/dts/socfpga.dtsi > +++ b/arch/arm/boot/dts/socfpga.dtsi > @@ -133,6 +133,13 @@ > #address-cells = <1>; > #size-cells = <0>; > > + clk_0: clk_0 { > + compatible = "fixed-clock"; > + #clock-cells = <0>; > + clock-frequency = <50000000>; > + clock-output-names = "clk_0-clk"; > + }; > + > osc1: osc1 { > #clock-cells = <0>; > compatible = "fixed-clock"; > @@ -529,11 +536,11 @@ > }; > }; > > - fpga_bridge0: fpga_bridge@ff400000 { > + fpga_bridge0: fpga_bridge@ff200000 { > compatible = "altr,socfpga-lwhps2fpga-bridge"; > - reg = <0xff400000 0x100000>; > + reg = <0xff200000 0x00200000>; > resets = <&rst LWHPS2FPGA_RESET>; > - clocks = <&l4_main_clk>; > + clocks = <&clk_0>; > }; > Why this change? This looks wrong and unrelated. The LWHPS2FPGA bridge is at 0xff400000, so it is correct the way it is or not? > fpga_bridge1: fpga_bridge@ff500000 { > diff --git a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts > index 155829f..f99576b 100644 > --- a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts > +++ b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts > @@ -68,6 +68,7 @@ > regulator-min-microvolt = <3300000>; > regulator-max-microvolt = <3300000>; > }; > + > }; ??? (...) Best regards, Steffen
Hi Steffen, On 06/06/2017 01:40 AM, Steffen Trumtrar wrote: > > Hi! > > thor.thayer@linux.intel.com writes: > >> From: Thor Thayer <thor.thayer@linux.intel.com> >> >> Add the Altera I2C Controller to the CycloneV SoCFPGA device tree. >> >> Signed-off-by: Thor Thayer <thor.thayer@linux.intel.com> >> --- >> v2 Remove altr, from fifo-size. >> Rename compatible string to "altr,softip-i2c" >> v3 Add version to commpatible string "altr,softip-i2c-v1.0" >> --- >> arch/arm/boot/dts/socfpga.dtsi | 13 ++++++++++--- >> arch/arm/boot/dts/socfpga_cyclone5_socdk.dts | 28 +++++++++++++++++++++++++++- >> 2 files changed, 37 insertions(+), 4 deletions(-) >> >> diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi >> index b2674bd..d69c13d 100644 >> --- a/arch/arm/boot/dts/socfpga.dtsi >> +++ b/arch/arm/boot/dts/socfpga.dtsi >> @@ -133,6 +133,13 @@ >> #address-cells = <1>; >> #size-cells = <0>; >> >> + clk_0: clk_0 { >> + compatible = "fixed-clock"; >> + #clock-cells = <0>; >> + clock-frequency = <50000000>; >> + clock-output-names = "clk_0-clk"; >> + }; >> + >> osc1: osc1 { >> #clock-cells = <0>; >> compatible = "fixed-clock"; >> @@ -529,11 +536,11 @@ >> }; >> }; >> >> - fpga_bridge0: fpga_bridge@ff400000 { >> + fpga_bridge0: fpga_bridge@ff200000 { >> compatible = "altr,socfpga-lwhps2fpga-bridge"; >> - reg = <0xff400000 0x100000>; >> + reg = <0xff200000 0x00200000>; >> resets = <&rst LWHPS2FPGA_RESET>; >> - clocks = <&l4_main_clk>; >> + clocks = <&clk_0>; >> }; >> > > Why this change? This looks wrong and unrelated. The LWHPS2FPGA bridge > is at 0xff400000, so it is correct the way it is or not? > Yes, good point. I was using the LWHPS2FPGA slave bus so I shouldn't change this one. I'll add the slave version. Thanks, Thor >> fpga_bridge1: fpga_bridge@ff500000 { >> diff --git a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts >> index 155829f..f99576b 100644 >> --- a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts >> +++ b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts >> @@ -68,6 +68,7 @@ >> regulator-min-microvolt = <3300000>; >> regulator-max-microvolt = <3300000>; >> }; >> + >> }; > > ??? > Whoops. I should remove the extra space. Thanks! > > (...) > > > Best regards, > Steffen >
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi index b2674bd..d69c13d 100644 --- a/arch/arm/boot/dts/socfpga.dtsi +++ b/arch/arm/boot/dts/socfpga.dtsi @@ -133,6 +133,13 @@ #address-cells = <1>; #size-cells = <0>; + clk_0: clk_0 { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <50000000>; + clock-output-names = "clk_0-clk"; + }; + osc1: osc1 { #clock-cells = <0>; compatible = "fixed-clock"; @@ -529,11 +536,11 @@ }; }; - fpga_bridge0: fpga_bridge@ff400000 { + fpga_bridge0: fpga_bridge@ff200000 { compatible = "altr,socfpga-lwhps2fpga-bridge"; - reg = <0xff400000 0x100000>; + reg = <0xff200000 0x00200000>; resets = <&rst LWHPS2FPGA_RESET>; - clocks = <&l4_main_clk>; + clocks = <&clk_0>; }; fpga_bridge1: fpga_bridge@ff500000 { diff --git a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts index 155829f..f99576b 100644 --- a/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts +++ b/arch/arm/boot/dts/socfpga_cyclone5_socdk.dts @@ -68,6 +68,7 @@ regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; }; + }; &can0 { @@ -101,7 +102,7 @@ }; &i2c0 { - status = "okay"; + status = "disabled"; clock-frequency = <100000>; /* @@ -176,3 +177,28 @@ &usb1 { status = "okay"; }; + +&fpga_bridge0 { + reg-names = "axi_h2f_lw"; + #address-cells = <2>; + #size-cells = <1>; + ranges = <0x00000001 0x00080000 0xff280000 0x00000040>; + + i2c_0: i2c@0x100080000 { + compatible = "altr,softip-i2c-v1.0"; + reg = <0x00000001 0x00080000 0x00000040>; + interrupt-parent = <&intc>; + interrupts = <0 43 4>; + clocks = <&clk_0>; + fifo-size = <4>; + clock-frequency = <100000>; + #address-cells = <1>; + #size-cells = <0>; + + eeprom@51 { + compatible = "atmel,24c32"; + reg = <0x51>; + pagesize = <32>; + }; + }; +};