* [PATCH v2 1/2] ARM: imx6sx-sdb: change default board as reva board
2015-01-21 1:34 [PATCH v2 0/2] ARM: imx6sx-sdb: add revb board Peter Chen
@ 2015-01-21 1:34 ` Peter Chen
2015-01-21 1:34 ` [PATCH v2 2/2] ARM: imx6sx-sdb: add revb board and make it default Peter Chen
2015-02-26 7:58 ` [PATCH v2 0/2] ARM: imx6sx-sdb: add revb board Shawn Guo
2 siblings, 0 replies; 5+ messages in thread
From: Peter Chen @ 2015-01-21 1:34 UTC (permalink / raw)
To: linux-arm-kernel
The imx6sx sdb board has two revisions, the current mainline one
is reva which is experimental and mainly for internal use. In
this commit, we rename imx6sx-sdb.dts to imx6sx-sdb.dtsi, and
move the reva dedicated contents to imx6sx-sdb-reva.dts.
Signed-off-by: Peter Chen <peter.chen@freescale.com>
---
arch/arm/boot/dts/Makefile | 2 +-
arch/arm/boot/dts/imx6sx-sdb-reva.dts | 143 +++++++++++++++++++++
.../boot/dts/{imx6sx-sdb.dts => imx6sx-sdb.dtsi} | 130 -------------------
3 files changed, 144 insertions(+), 131 deletions(-)
create mode 100644 arch/arm/boot/dts/imx6sx-sdb-reva.dts
rename arch/arm/boot/dts/{imx6sx-sdb.dts => imx6sx-sdb.dtsi} (83%)
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 7be7a6f..50eff7b 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -303,7 +303,7 @@ dtb-$(CONFIG_SOC_IMX6SL) += \
imx6sl-evk.dtb
dtb-$(CONFIG_SOC_IMX6SX) += \
imx6sx-sabreauto.dtb \
- imx6sx-sdb.dtb \
+ imx6sx-sdb-reva.dtb
dtb-$(CONFIG_SOC_LS1021A) += \
ls1021a-qds.dtb \
ls1021a-twr.dtb
diff --git a/arch/arm/boot/dts/imx6sx-sdb-reva.dts b/arch/arm/boot/dts/imx6sx-sdb-reva.dts
new file mode 100644
index 0000000..c76b87c
--- /dev/null
+++ b/arch/arm/boot/dts/imx6sx-sdb-reva.dts
@@ -0,0 +1,143 @@
+/*
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "imx6sx-sdb.dtsi"
+
+/ {
+ model = "Freescale i.MX6 SoloX SDB RevA Board";
+};
+
+&i2c1 {
+ clock-frequency = <100000>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c1>;
+ status = "okay";
+
+ pmic: pfuze100 at 08 {
+ compatible = "fsl,pfuze100";
+ reg = <0x08>;
+
+ regulators {
+ sw1a_reg: sw1ab {
+ regulator-min-microvolt = <300000>;
+ regulator-max-microvolt = <1875000>;
+ regulator-boot-on;
+ regulator-always-on;
+ regulator-ramp-delay = <6250>;
+ };
+
+ sw1c_reg: sw1c {
+ regulator-min-microvolt = <300000>;
+ regulator-max-microvolt = <1875000>;
+ regulator-boot-on;
+ regulator-always-on;
+ regulator-ramp-delay = <6250>;
+ };
+
+ sw2_reg: sw2 {
+ regulator-min-microvolt = <800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ sw3a_reg: sw3a {
+ regulator-min-microvolt = <400000>;
+ regulator-max-microvolt = <1975000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ sw3b_reg: sw3b {
+ regulator-min-microvolt = <400000>;
+ regulator-max-microvolt = <1975000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ sw4_reg: sw4 {
+ regulator-min-microvolt = <800000>;
+ regulator-max-microvolt = <3300000>;
+ };
+
+ swbst_reg: swbst {
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5150000>;
+ };
+
+ snvs_reg: vsnvs {
+ regulator-min-microvolt = <1000000>;
+ regulator-max-microvolt = <3000000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ vref_reg: vrefddr {
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ vgen1_reg: vgen1 {
+ regulator-min-microvolt = <800000>;
+ regulator-max-microvolt = <1550000>;
+ regulator-always-on;
+ };
+
+ vgen2_reg: vgen2 {
+ regulator-min-microvolt = <800000>;
+ regulator-max-microvolt = <1550000>;
+ };
+
+ vgen3_reg: vgen3 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
+ vgen4_reg: vgen4 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
+ vgen5_reg: vgen5 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
+ vgen6_reg: vgen6 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+ };
+ };
+};
+
+&qspi2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_qspi2>;
+ status = "okay";
+
+ flash0: s25fl128s at 0 {
+ reg = <0>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "spansion,s25fl128s";
+ spi-max-frequency = <66000000>;
+ };
+
+ flash1: s25fl128s at 1 {
+ reg = <1>;
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "spansion,s25fl128s";
+ spi-max-frequency = <66000000>;
+ };
+};
diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dtsi
similarity index 83%
rename from arch/arm/boot/dts/imx6sx-sdb.dts
rename to arch/arm/boot/dts/imx6sx-sdb.dtsi
index cdffe84..33ea87e 100644
--- a/arch/arm/boot/dts/imx6sx-sdb.dts
+++ b/arch/arm/boot/dts/imx6sx-sdb.dtsi
@@ -169,114 +169,6 @@
status = "okay";
};
-&i2c1 {
- clock-frequency = <100000>;
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_i2c1>;
- status = "okay";
-
- pmic: pfuze100 at 08 {
- compatible = "fsl,pfuze100";
- reg = <0x08>;
-
- regulators {
- sw1a_reg: sw1ab {
- regulator-min-microvolt = <300000>;
- regulator-max-microvolt = <1875000>;
- regulator-boot-on;
- regulator-always-on;
- regulator-ramp-delay = <6250>;
- };
-
- sw1c_reg: sw1c {
- regulator-min-microvolt = <300000>;
- regulator-max-microvolt = <1875000>;
- regulator-boot-on;
- regulator-always-on;
- regulator-ramp-delay = <6250>;
- };
-
- sw2_reg: sw2 {
- regulator-min-microvolt = <800000>;
- regulator-max-microvolt = <3300000>;
- regulator-boot-on;
- regulator-always-on;
- };
-
- sw3a_reg: sw3a {
- regulator-min-microvolt = <400000>;
- regulator-max-microvolt = <1975000>;
- regulator-boot-on;
- regulator-always-on;
- };
-
- sw3b_reg: sw3b {
- regulator-min-microvolt = <400000>;
- regulator-max-microvolt = <1975000>;
- regulator-boot-on;
- regulator-always-on;
- };
-
- sw4_reg: sw4 {
- regulator-min-microvolt = <800000>;
- regulator-max-microvolt = <3300000>;
- };
-
- swbst_reg: swbst {
- regulator-min-microvolt = <5000000>;
- regulator-max-microvolt = <5150000>;
- };
-
- snvs_reg: vsnvs {
- regulator-min-microvolt = <1000000>;
- regulator-max-microvolt = <3000000>;
- regulator-boot-on;
- regulator-always-on;
- };
-
- vref_reg: vrefddr {
- regulator-boot-on;
- regulator-always-on;
- };
-
- vgen1_reg: vgen1 {
- regulator-min-microvolt = <800000>;
- regulator-max-microvolt = <1550000>;
- regulator-always-on;
- };
-
- vgen2_reg: vgen2 {
- regulator-min-microvolt = <800000>;
- regulator-max-microvolt = <1550000>;
- };
-
- vgen3_reg: vgen3 {
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <3300000>;
- regulator-always-on;
- };
-
- vgen4_reg: vgen4 {
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <3300000>;
- regulator-always-on;
- };
-
- vgen5_reg: vgen5 {
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <3300000>;
- regulator-always-on;
- };
-
- vgen6_reg: vgen6 {
- regulator-min-microvolt = <1800000>;
- regulator-max-microvolt = <3300000>;
- regulator-always-on;
- };
- };
- };
-};
-
&i2c4 {
clock-frequency = <100000>;
pinctrl-names = "default";
@@ -340,28 +232,6 @@
status = "okay";
};
-&qspi2 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_qspi2>;
- status = "okay";
-
- flash0: s25fl128s at 0 {
- reg = <0>;
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "spansion,s25fl128s";
- spi-max-frequency = <66000000>;
- };
-
- flash1: s25fl128s at 1 {
- reg = <1>;
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "spansion,s25fl128s";
- spi-max-frequency = <66000000>;
- };
-};
-
&ssi2 {
status = "okay";
};
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 2/2] ARM: imx6sx-sdb: add revb board and make it default
2015-01-21 1:34 [PATCH v2 0/2] ARM: imx6sx-sdb: add revb board Peter Chen
2015-01-21 1:34 ` [PATCH v2 1/2] ARM: imx6sx-sdb: change default board as reva board Peter Chen
@ 2015-01-21 1:34 ` Peter Chen
2015-02-26 7:58 ` [PATCH v2 0/2] ARM: imx6sx-sdb: add revb board Shawn Guo
2 siblings, 0 replies; 5+ messages in thread
From: Peter Chen @ 2015-01-21 1:34 UTC (permalink / raw)
To: linux-arm-kernel
Since imx6sx-sdb reva board is experimental and will not be used
formally (eg, no software release based on it), we set revb board
as the formal imx6sx-sdb board.
The imx6sx-sdb uses pfuse200 as pmic which has only one power supply
for both VDDARM_IN and VDDSOC_IN, so VDDARM_IN and VDDSOC_IN have to
use the same (higher one in the same frequency) one as its power supply,
that's the reason we override the OPP setting in board dts file.
Signed-off-by: Peter Chen <peter.chen@freescale.com>
---
arch/arm/boot/dts/Makefile | 3 +-
arch/arm/boot/dts/imx6sx-sdb.dts | 145 +++++++++++++++++++++++++++++++++++++++
2 files changed, 147 insertions(+), 1 deletion(-)
create mode 100644 arch/arm/boot/dts/imx6sx-sdb.dts
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 50eff7b..71bfdf7 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -303,7 +303,8 @@ dtb-$(CONFIG_SOC_IMX6SL) += \
imx6sl-evk.dtb
dtb-$(CONFIG_SOC_IMX6SX) += \
imx6sx-sabreauto.dtb \
- imx6sx-sdb-reva.dtb
+ imx6sx-sdb-reva.dtb \
+ imx6sx-sdb.dtb
dtb-$(CONFIG_SOC_LS1021A) += \
ls1021a-qds.dtb \
ls1021a-twr.dtb
diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts
new file mode 100644
index 0000000..0bfc4e7
--- /dev/null
+++ b/arch/arm/boot/dts/imx6sx-sdb.dts
@@ -0,0 +1,145 @@
+/*
+ * Copyright (C) 2015 Freescale Semiconductor, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "imx6sx-sdb.dtsi"
+
+/ {
+ model = "Freescale i.MX6 SoloX SDB RevB Board";
+};
+
+&cpu0 {
+ operating-points = <
+ /* kHz uV */
+ 996000 1250000
+ 792000 1175000
+ 396000 1175000
+ >;
+ fsl,soc-operating-points = <
+ /* ARM kHz SOC uV */
+ 996000 1250000
+ 792000 1175000
+ 396000 1175000
+ >;
+};
+
+&i2c1 {
+ clock-frequency = <100000>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_i2c1>;
+ status = "okay";
+
+ pmic: pfuze100 at 08 {
+ compatible = "fsl,pfuze200";
+ reg = <0x08>;
+
+ regulators {
+ sw1a_reg: sw1ab {
+ regulator-min-microvolt = <300000>;
+ regulator-max-microvolt = <1875000>;
+ regulator-boot-on;
+ regulator-always-on;
+ regulator-ramp-delay = <6250>;
+ };
+
+ sw2_reg: sw2 {
+ regulator-min-microvolt = <800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ sw3a_reg: sw3a {
+ regulator-min-microvolt = <400000>;
+ regulator-max-microvolt = <1975000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ sw3b_reg: sw3b {
+ regulator-min-microvolt = <400000>;
+ regulator-max-microvolt = <1975000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ swbst_reg: swbst {
+ regulator-min-microvolt = <5000000>;
+ regulator-max-microvolt = <5150000>;
+ };
+
+ snvs_reg: vsnvs {
+ regulator-min-microvolt = <1000000>;
+ regulator-max-microvolt = <3000000>;
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ vref_reg: vrefddr {
+ regulator-boot-on;
+ regulator-always-on;
+ };
+
+ vgen1_reg: vgen1 {
+ regulator-min-microvolt = <800000>;
+ regulator-max-microvolt = <1550000>;
+ regulator-always-on;
+ };
+
+ vgen2_reg: vgen2 {
+ regulator-min-microvolt = <800000>;
+ regulator-max-microvolt = <1550000>;
+ };
+
+ vgen3_reg: vgen3 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
+ vgen4_reg: vgen4 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
+ vgen5_reg: vgen5 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+
+ vgen6_reg: vgen6 {
+ regulator-min-microvolt = <1800000>;
+ regulator-max-microvolt = <3300000>;
+ regulator-always-on;
+ };
+ };
+ };
+};
+
+&qspi2 {
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_qspi2>;
+ status = "okay";
+
+ flash0: n25q256a at 0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "micron,n25q256a";
+ spi-max-frequency = <29000000>;
+ reg = <0>;
+ };
+
+ flash1: n25q256a at 1 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "micron,n25q256a";
+ spi-max-frequency = <29000000>;
+ reg = <1>;
+ };
+};
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 0/2] ARM: imx6sx-sdb: add revb board
2015-01-21 1:34 [PATCH v2 0/2] ARM: imx6sx-sdb: add revb board Peter Chen
2015-01-21 1:34 ` [PATCH v2 1/2] ARM: imx6sx-sdb: change default board as reva board Peter Chen
2015-01-21 1:34 ` [PATCH v2 2/2] ARM: imx6sx-sdb: add revb board and make it default Peter Chen
@ 2015-02-26 7:58 ` Shawn Guo
2015-02-26 9:18 ` Peter Chen
2 siblings, 1 reply; 5+ messages in thread
From: Shawn Guo @ 2015-02-26 7:58 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jan 21, 2015 at 09:34:52AM +0800, Peter Chen wrote:
> Hi Shawn,
>
> The imx6sx-sdb board has two revisions, the current mainline is the
> reva which is experimental and will not be released, the revb board
> is used widely for internal and external users.
>
> The main changes between reva and revb board:
> - OOP setting
> - pfuse
> - qspi
> - can transceiver (not mainlined)
>
> Changes for v2:
>
> - Add missing Makefile entries for both dts files. [Patch 1/2] and [Patch 2/2]
> - Delete OOP setting changed at imx6sx-sdb-reva, it is SoC feature,
> it doesn't need to be change unless board limitations. [Patch 1/2]
> - Add explanation why OOP setting need to changed at imx6sx-sdb revb board. [Patch 2/2]
> - Make imx6sx-sdb revb board as default imx6sx-sdb board. [Patch 2/2]
>
> Peter Chen (2):
> ARM: imx6sx-sdb: change default board as reva board
> ARM: imx6sx-sdb: add revb board and make it default
Peter,
What branch did you generate these patches on? I'm trying to apply
them, but they do not apply on any reasonable branch. Can you re-spin
against v4.0-rc1? Thanks.
Shawn
>
> arch/arm/boot/dts/Makefile | 3 +-
> arch/arm/boot/dts/imx6sx-sdb-reva.dts | 143 +++++++++
> arch/arm/boot/dts/imx6sx-sdb.dts | 588 ++--------------------------------
> arch/arm/boot/dts/imx6sx-sdb.dtsi | 547 +++++++++++++++++++++++++++++++
> 4 files changed, 720 insertions(+), 561 deletions(-)
> create mode 100644 arch/arm/boot/dts/imx6sx-sdb-reva.dts
> create mode 100644 arch/arm/boot/dts/imx6sx-sdb.dtsi
>
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2 0/2] ARM: imx6sx-sdb: add revb board
2015-02-26 7:58 ` [PATCH v2 0/2] ARM: imx6sx-sdb: add revb board Shawn Guo
@ 2015-02-26 9:18 ` Peter Chen
0 siblings, 0 replies; 5+ messages in thread
From: Peter Chen @ 2015-02-26 9:18 UTC (permalink / raw)
To: linux-arm-kernel
> >
> > The main changes between reva and revb board:
> > - OOP setting
> > - pfuse
> > - qspi
> > - can transceiver (not mainlined)
> >
> > Changes for v2:
> >
> > - Add missing Makefile entries for both dts files. [Patch 1/2] and
> > [Patch 2/2]
> > - Delete OOP setting changed at imx6sx-sdb-reva, it is SoC feature,
> > it doesn't need to be change unless board limitations. [Patch 1/2]
> > - Add explanation why OOP setting need to changed at imx6sx-sdb revb
> > board. [Patch 2/2]
> > - Make imx6sx-sdb revb board as default imx6sx-sdb board. [Patch 2/2]
> >
> > Peter Chen (2):
> > ARM: imx6sx-sdb: change default board as reva board
> > ARM: imx6sx-sdb: add revb board and make it default
>
> Peter,
>
> What branch did you generate these patches on? I'm trying to apply them, but
> they do not apply on any reasonable branch. Can you re-spin against v4.0-rc1?
> Thanks.
>
I did it based on two or three weeks Linux-next tree, I will send it based on
v4.0-rc1 today.
Peter
^ permalink raw reply [flat|nested] 5+ messages in thread