| Message ID | 1411718851-17436-2-git-send-email-mike.rapoport@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Fri, Sep 26, 2014 at 1:07 AM, Mike Rapoport <mike.rapoport@gmail.com> wrote: Cool to see the addition of dt for additional devices. I do however not think it is correct to put all these things in common... > diff --git a/arch/arm/boot/dts/qcom-apq8064-board-common.dtsi b/arch/arm/boot/dts/qcom-apq8064-board-common.dtsi > new file mode 100644 > index 0000000..c92d3e9 > --- /dev/null > +++ b/arch/arm/boot/dts/qcom-apq8064-board-common.dtsi > @@ -0,0 +1,57 @@ > +#include "qcom-apq8064-v2.0.dtsi" > + > +/ { > + > + soc { > + pinctrl@800000 { > + i2c1_pins: i2c1 { > + mux { > + pins = "gpio20", "gpio21"; > + function = "gsbi1"; > + }; The muxing is common, but you probably want to be able to set drive strength and bias as well and handle active vs sleep mode and then I'm not sure if it is common anymore... > + }; > + }; > + > + gsbi@12440000 { > + status = "okay"; > + qcom,mode = <GSBI_PROT_I2C>; > + > + i2c@12460000 { > + status = "okay"; > + clock-frequency = <200000>; > + pinctrl-0 = <&i2c1_pins>; > + pinctrl-names = "default"; > + > + eeprom: eeprom@52 { > + compatible = "atmel,24c128"; > + reg = <0x52>; > + pagesize = <32>; > + }; Not all apq8064 boards have this eeprom. > + }; > + }; > + > + gsbi@16600000 { > + status = "ok"; > + qcom,mode = <GSBI_PROT_I2C_UART>; > + serial@16640000 { > + status = "ok"; > + }; > + }; > + > + amba { > + /* eMMC */ > + sdcc1: sdcc@12400000 { > + status = "okay"; > + }; > + > + /* External micro SD card */ > + sdcc3: sdcc@12180000 { > + status = "okay"; > + }; > + /* WLAN */ > + sdcc4: sdcc@121c0000 { > + status = "okay"; > + }; I'm not sure if all boards are using sdcc4 for WiFi. Regards, Bjorn
On Sep 26, 2014, at 8:41 AM, Bjorn Andersson <bjorn@kryo.se> wrote: > On Fri, Sep 26, 2014 at 1:07 AM, Mike Rapoport <mike.rapoport@gmail.com> wrote: > > Cool to see the addition of dt for additional devices. I do however > not think it is correct to put all these things in common… I’m with Bjorn, just duplicate the settings for the cm-qs600 board in its .dts file. - k
diff --git a/arch/arm/boot/dts/qcom-apq8064-board-common.dtsi b/arch/arm/boot/dts/qcom-apq8064-board-common.dtsi new file mode 100644 index 0000000..c92d3e9 --- /dev/null +++ b/arch/arm/boot/dts/qcom-apq8064-board-common.dtsi @@ -0,0 +1,57 @@ +#include "qcom-apq8064-v2.0.dtsi" + +/ { + + soc { + pinctrl@800000 { + i2c1_pins: i2c1 { + mux { + pins = "gpio20", "gpio21"; + function = "gsbi1"; + }; + }; + }; + + gsbi@12440000 { + status = "okay"; + qcom,mode = <GSBI_PROT_I2C>; + + i2c@12460000 { + status = "okay"; + clock-frequency = <200000>; + pinctrl-0 = <&i2c1_pins>; + pinctrl-names = "default"; + + eeprom: eeprom@52 { + compatible = "atmel,24c128"; + reg = <0x52>; + pagesize = <32>; + }; + }; + }; + + gsbi@16600000 { + status = "ok"; + qcom,mode = <GSBI_PROT_I2C_UART>; + serial@16640000 { + status = "ok"; + }; + }; + + amba { + /* eMMC */ + sdcc1: sdcc@12400000 { + status = "okay"; + }; + + /* External micro SD card */ + sdcc3: sdcc@12180000 { + status = "okay"; + }; + /* WLAN */ + sdcc4: sdcc@121c0000 { + status = "okay"; + }; + }; + }; +}; diff --git a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts index b396c83..61784d7 100644 --- a/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts +++ b/arch/arm/boot/dts/qcom-apq8064-ifc6410.dts @@ -1,59 +1,7 @@ -#include "qcom-apq8064-v2.0.dtsi" +#include "qcom-apq8064-board-common.dtsi" / { model = "Qualcomm APQ8064/IFC6410"; compatible = "qcom,apq8064-ifc6410", "qcom,apq8064"; - soc { - pinctrl@800000 { - i2c1_pins: i2c1 { - mux { - pins = "gpio20", "gpio21"; - function = "gsbi1"; - }; - }; - }; - - gsbi@12440000 { - status = "okay"; - qcom,mode = <GSBI_PROT_I2C>; - - i2c@12460000 { - status = "okay"; - clock-frequency = <200000>; - pinctrl-0 = <&i2c1_pins>; - pinctrl-names = "default"; - - eeprom: eeprom@52 { - compatible = "atmel,24c128"; - reg = <0x52>; - pagesize = <32>; - }; - }; - }; - - gsbi@16600000 { - status = "ok"; - qcom,mode = <GSBI_PROT_I2C_UART>; - serial@16640000 { - status = "ok"; - }; - }; - - amba { - /* eMMC */ - sdcc1: sdcc@12400000 { - status = "okay"; - }; - - /* External micro SD card */ - sdcc3: sdcc@12180000 { - status = "okay"; - }; - /* WLAN */ - sdcc4: sdcc@121c0000 { - status = "okay"; - }; - }; - }; };
This way similar boards will be able to share common definitions. Signed-off-by: Mike Rapoport <mike.rapoport@gmail.com> --- arch/arm/boot/dts/qcom-apq8064-board-common.dtsi | 57 ++++++++++++++++++++++++ arch/arm/boot/dts/qcom-apq8064-ifc6410.dts | 54 +--------------------- 2 files changed, 58 insertions(+), 53 deletions(-) create mode 100644 arch/arm/boot/dts/qcom-apq8064-board-common.dtsi