* [PATCH v2 1/2] arm64: dts: ti: k3-j7200-mcu-wakeup: Add HyperBus node
2020-09-23 16:31 [PATCH v2 0/2] arm64: dts: ti: k3-j7200: Add HyperFlash related nodes Vignesh Raghavendra
@ 2020-09-23 16:31 ` Vignesh Raghavendra
2020-09-23 16:31 ` [PATCH v2 2/2] arm64: dts: ti: k3-j7200-som-p0: Add HyperFlash node Vignesh Raghavendra
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Vignesh Raghavendra @ 2020-09-23 16:31 UTC (permalink / raw)
To: Tero Kristo, Nishanth Menon
Cc: Rob Herring, linux-arm-kernel, devicetree, linux-kernel
J7200 has a Flash SubSystem that has one OSPI and one HyperBus.. Add
DT nodes for HyperBus controller for now.
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
---
.../boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 27 +++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi b/arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi
index a43385d8feca..ab22b02c0da5 100644
--- a/arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi
@@ -125,4 +125,31 @@ wkup_i2c0: i2c@42120000 {
clocks = <&k3_clks 197 1>;
power-domains = <&k3_pds 197 TI_SCI_PD_SHARED>;
};
+
+ fss: syscon@47000000 {
+ compatible = "syscon", "simple-mfd";
+ reg = <0x00 0x47000000 0x00 0x100>;
+ #address-cells = <2>;
+ #size-cells = <2>;
+ ranges;
+
+ hbmc_mux: hbmc-mux {
+ compatible = "mmio-mux";
+ #mux-control-cells = <1>;
+ mux-reg-masks = <0x4 0x2>; /* HBMC select */
+ };
+
+ hbmc: hyperbus@47034000 {
+ compatible = "ti,am654-hbmc";
+ reg = <0x00 0x47034000 0x00 0x100>,
+ <0x05 0x00000000 0x01 0x0000000>;
+ power-domains = <&k3_pds 102 TI_SCI_PD_EXCLUSIVE>;
+ clocks = <&k3_clks 102 0>;
+ assigned-clocks = <&k3_clks 102 5>;
+ assigned-clock-rates = <333333333>;
+ #address-cells = <2>;
+ #size-cells = <1>;
+ mux-controls = <&hbmc_mux 0>;
+ };
+ };
};
--
2.28.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH v2 2/2] arm64: dts: ti: k3-j7200-som-p0: Add HyperFlash node
2020-09-23 16:31 [PATCH v2 0/2] arm64: dts: ti: k3-j7200: Add HyperFlash related nodes Vignesh Raghavendra
2020-09-23 16:31 ` [PATCH v2 1/2] arm64: dts: ti: k3-j7200-mcu-wakeup: Add HyperBus node Vignesh Raghavendra
@ 2020-09-23 16:31 ` Vignesh Raghavendra
2020-09-24 9:46 ` [PATCH v2 0/2] arm64: dts: ti: k3-j7200: Add HyperFlash related nodes Sekhar Nori
2020-09-24 11:13 ` Nishanth Menon
3 siblings, 0 replies; 5+ messages in thread
From: Vignesh Raghavendra @ 2020-09-23 16:31 UTC (permalink / raw)
To: Tero Kristo, Nishanth Menon
Cc: Rob Herring, linux-arm-kernel, devicetree, linux-kernel
J7200 SoM has a HyperFlash connected to HyperBus memory controller. But
HyperBus is muxed with OSPI, therefore keep HyperBus node disabled.
Bootloader will detect the mux and enable the node as required.
Signed-off-by: Vignesh Raghavendra <vigneshr@ti.com>
---
arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 36 +++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi b/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi
index f7e271c442a0..6a98ba499bc2 100644
--- a/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi
@@ -27,3 +27,39 @@ secure_ddr: optee@9e800000 {
};
};
};
+
+&wkup_pmx0 {
+ mcu_fss0_hpb0_pins_default: mcu-fss0-hpb0-pins-default {
+ pinctrl-single,pins = <
+ J721E_WKUP_IOPAD(0x0, PIN_OUTPUT, 1) /* (B6) MCU_OSPI0_CLK.MCU_HYPERBUS0_CK */
+ J721E_WKUP_IOPAD(0x4, PIN_OUTPUT, 1) /* (C8) MCU_OSPI0_LBCLKO.MCU_HYPERBUS0_CKn */
+ J721E_WKUP_IOPAD(0x2c, PIN_OUTPUT, 1) /* (D6) MCU_OSPI0_CSn0.MCU_HYPERBUS0_CSn0 */
+ J721E_WKUP_IOPAD(0x30, PIN_OUTPUT, 1) /* (D7) MCU_OSPI0_CSn1.MCU_HYPERBUS0_RESETn */
+ J721E_WKUP_IOPAD(0x8, PIN_INPUT, 1) /* (B7) MCU_OSPI0_DQS.MCU_HYPERBUS0_RWDS */
+ J721E_WKUP_IOPAD(0xc, PIN_INPUT, 1) /* (D8) MCU_OSPI0_D0.MCU_HYPERBUS0_DQ0 */
+ J721E_WKUP_IOPAD(0x10, PIN_INPUT, 1) /* (C7) MCU_OSPI0_D1.MCU_HYPERBUS0_DQ1 */
+ J721E_WKUP_IOPAD(0x14, PIN_INPUT, 1) /* (C5) MCU_OSPI0_D2.MCU_HYPERBUS0_DQ2 */
+ J721E_WKUP_IOPAD(0x18, PIN_INPUT, 1) /* (A5) MCU_OSPI0_D3.MCU_HYPERBUS0_DQ3 */
+ J721E_WKUP_IOPAD(0x1c, PIN_INPUT, 1) /* (A6) MCU_OSPI0_D4.MCU_HYPERBUS0_DQ4 */
+ J721E_WKUP_IOPAD(0x20, PIN_INPUT, 1) /* (B8) MCU_OSPI0_D5.MCU_HYPERBUS0_DQ5 */
+ J721E_WKUP_IOPAD(0x24, PIN_INPUT, 1) /* (A8) MCU_OSPI0_D6.MCU_HYPERBUS0_DQ6 */
+ J721E_WKUP_IOPAD(0x28, PIN_INPUT, 1) /* (A7) MCU_OSPI0_D7.MCU_HYPERBUS0_DQ7 */
+ >;
+ };
+};
+
+&hbmc {
+ /* OSPI and HBMC are muxed inside FSS, Bootloader will enable
+ * appropriate node based on board detection
+ */
+ status = "disabled";
+ pinctrl-names = "default";
+ pinctrl-0 = <&mcu_fss0_hpb0_pins_default>;
+ ranges = <0x00 0x00 0x05 0x00000000 0x4000000>, /* 64MB Flash on CS0 */
+ <0x01 0x00 0x05 0x04000000 0x800000>; /* 8MB RAM on CS1 */
+
+ flash@0,0 {
+ compatible = "cypress,hyperflash", "cfi-flash";
+ reg = <0x00 0x00 0x4000000>;
+ };
+};
--
2.28.0
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH v2 0/2] arm64: dts: ti: k3-j7200: Add HyperFlash related nodes
2020-09-23 16:31 [PATCH v2 0/2] arm64: dts: ti: k3-j7200: Add HyperFlash related nodes Vignesh Raghavendra
` (2 preceding siblings ...)
2020-09-24 9:46 ` [PATCH v2 0/2] arm64: dts: ti: k3-j7200: Add HyperFlash related nodes Sekhar Nori
@ 2020-09-24 11:13 ` Nishanth Menon
3 siblings, 0 replies; 5+ messages in thread
From: Nishanth Menon @ 2020-09-24 11:13 UTC (permalink / raw)
To: Tero Kristo, Vignesh Raghavendra
Cc: Nishanth Menon, linux-kernel, devicetree, linux-arm-kernel, Rob Herring
On Wed, 23 Sep 2020 22:01:48 +0530, Vignesh Raghavendra wrote:
> This series adds HyperBus and HyperFlash nodes for TI's J7200 SoC
>
> v2:
> Rebase on latest ti-k3-next + I2C series
> Align reg address format with this file's convention
>
> Vignesh Raghavendra (2):
> arm64: dts: ti: k3-j7200-mcu-wakeup: Add HyperBus node
> arm64: dts: ti: k3-j7200-som-p0: Add HyperFlash node
>
> [...]
Hi Vignesh Raghavendra,
I have applied the following to branch ti-k3-dts-next on [1].
Thank you!
[1/2] arm64: dts: ti: k3-j7200-mcu-wakeup: Add HyperBus node
commit: b905466d930a17393f3b67514568b14cbd629b34
[2/2] arm64: dts: ti: k3-j7200-som-p0: Add HyperFlash node
commit: 78af3696f4b92b1038805e480f21ba2f51353276
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent up the chain during
the next merge window (or sooner if it is a relevant bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
[1] git://git.kernel.org/pub/scm/linux/kernel/git/nmenon/linux.git
--
Regards,
Nishanth Menon
Key (0xDDB5849D1736249D) / Fingerprint: F8A2 8693 54EB 8232 17A3 1A34 DDB5 849D 1736 249D
^ permalink raw reply [flat|nested] 5+ messages in thread