[PATCH v3 0/3] arm64: dts: g12a: Add peripherals

[PATCH v3 0/3] arm64: dts: g12a: Add peripherals

[Neil Armstrong]

Add following peripherals :
- SAR-ADC
- USB
- Mali GPU

Dependencies :
- ADC

Depends on CLKID_AO_SAR_ADC_SEL, stable clk headers tags will be
available after v5.1-rc4

Bindings has been merged for 5.2-rc1

- USB

USB depends on the CLKID_PCIE_PLL, stable clk headers tags will be
available after v5.1-rc4

USB2 PHY depends on missing Reset bindings, have been applied to
reset/fixes, waiting to be merge into master or immutable branch/tag

Bindings has been Reviewed, waiting to be applied

- Mali

No Clk or Reset dependencies

Mali GPU bindings are still in review.

Changes since v2 :
- dropped applied patches
- collected review tags

Changes since v1 :
- dropped already applied "Add AO Secure node"
- dropped meson-g12a-u200.dts uart_AO change
- fixed includes overall to fix build for each patches
- removed disabled status in dwc2 node
- removed uart_ao_a_c pinctrl
- fixed uart pinctrl node name

Neil Armstrong (3):
  arm64: dts: meson: g12a: Add SAR ADC node
  arm64: dts: meson: g12a: Add G12A USB nodes
  arm64: dts: meson: g12a: Add mali-g31 gpu node

 arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 117 ++++++++++++++++++++
 1 file changed, 117 insertions(+)

-- 
2.21.0

[PATCH v3 1/3] arm64: dts: meson: g12a: Add SAR ADC node

[Neil Armstrong]

This patch adds the SAR ADC controller node.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
 arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
index 4d04742b05c2..4b3be7e60b4d 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
@@ -5,6 +5,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/clock/g12a-clkc.h>
+#include <dt-bindings/clock/g12a-aoclkc.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
@@ -282,6 +283,20 @@
 				clock-names = "xtal", "pclk", "baud";
 				status = "disabled";
 			};
+
+			saradc: adc@9000 {
+				compatible = "amlogic,meson-g12a-saradc",
+					     "amlogic,meson-saradc";
+				reg = <0x0 0x9000 0x0 0x48>;
+				#io-channel-cells = <1>;
+				interrupts = <GIC_SPI 200 IRQ_TYPE_EDGE_RISING>;
+				clocks = <&xtal>,
+					 <&clkc_AO CLKID_AO_SAR_ADC>,
+					 <&clkc_AO CLKID_AO_SAR_ADC_CLK>,
+					 <&clkc_AO CLKID_AO_SAR_ADC_SEL>;
+				clock-names = "clkin", "core", "adc_clk", "adc_sel";
+				status = "disabled";
+			};
 		};
 
 		gic: interrupt-controller@ffc01000 {
-- 
2.21.0

[PATCH v3 2/3] arm64: dts: meson: g12a: Add G12A USB nodes

[Neil Armstrong]

This patch adds the nodes for the USB Complex found in the Amlogic
G12A SoC.

It includes the :
- 2 USB2 PHYs
- 1 USB3 + PCIE Combo PHY
- the USB Glue with it's DWC2 and DWC3 sub-nodes

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
Reviewed-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
---
 arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 75 +++++++++++++++++++++
 1 file changed, 75 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
index 4b3be7e60b4d..a9cd91f033f2 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
@@ -3,11 +3,13 @@
  * Copyright (c) 2018 Amlogic, Inc. All rights reserved.
  */
 
+#include <dt-bindings/phy/phy.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/clock/g12a-clkc.h>
 #include <dt-bindings/clock/g12a-aoclkc.h>
 #include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/reset/amlogic,meson-g12a-reset.h>
 
 / {
 	compatible = "amlogic,g12a";
@@ -175,6 +177,26 @@
 				};
 			};
 
+			usb2_phy0: phy@36000 {
+				compatible = "amlogic,g12a-usb2-phy";
+				reg = <0x0 0x36000 0x0 0x2000>;
+				clocks = <&xtal>;
+				clock-names = "xtal";
+				resets = <&reset RESET_USB_PHY20>;
+				reset-names = "phy";
+				#phy-cells = <0>;
+			};
+
+			usb2_phy1: phy@3a000 {
+				compatible = "amlogic,g12a-usb2-phy";
+				reg = <0x0 0x3a000 0x0 0x2000>;
+				clocks = <&xtal>;
+				clock-names = "xtal";
+				resets = <&reset RESET_USB_PHY21>;
+				reset-names = "phy";
+				#phy-cells = <0>;
+			};
+
 			hiu: bus@3c000 {
 				compatible = "simple-bus";
 				reg = <0x0 0x3c000 0x0 0x1400>;
@@ -195,6 +217,18 @@
 					};
 				};
 			};
+
+			usb3_pcie_phy: phy@46000 {
+				compatible = "amlogic,g12a-usb3-pcie-phy";
+				reg = <0x0 0x46000 0x0 0x2000>;
+				clocks = <&clkc CLKID_PCIE_PLL>;
+				clock-names = "ref_clk";
+				resets = <&reset RESET_PCIE_PHY>;
+				reset-names = "phy";
+				assigned-clocks = <&clkc CLKID_PCIE_PLL>;
+				assigned-clock-rates = <100000000>;
+				#phy-cells = <1>;
+			};
 		};
 
 		aobus: bus@ff800000 {
@@ -358,6 +392,47 @@
 				status = "disabled";
 			};
 		};
+
+		usb: usb@ffe09000 {
+			status = "disabled";
+			compatible = "amlogic,meson-g12a-usb-ctrl";
+			reg = <0x0 0xffe09000 0x0 0xa0>;
+			interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
+			#address-cells = <2>;
+			#size-cells = <2>;
+			ranges;
+
+			clocks = <&clkc CLKID_USB>;
+			resets = <&reset RESET_USB>;
+
+			dr_mode = "otg";
+
+			phys = <&usb2_phy0>, <&usb2_phy1>,
+			       <&usb3_pcie_phy PHY_TYPE_USB3>;
+			phy-names = "usb2-phy0", "usb2-phy1", "usb3-phy0";
+
+			dwc2: usb@ff400000 {
+				compatible = "amlogic,meson-g12a-usb", "snps,dwc2";
+				reg = <0x0 0xff400000 0x0 0x40000>;
+				interrupts = <GIC_SPI 31 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&clkc CLKID_USB1_DDR_BRIDGE>;
+				clock-names = "ddr";
+				phys = <&usb2_phy1>;
+				dr_mode = "peripheral";
+				g-rx-fifo-size = <192>;
+				g-np-tx-fifo-size = <128>;
+				g-tx-fifo-size = <128 128 16 16 16>;
+			};
+
+			dwc3: usb@ff500000 {
+				compatible = "snps,dwc3";
+				reg = <0x0 0xff500000 0x0 0x100000>;
+				interrupts = <GIC_SPI 30 IRQ_TYPE_LEVEL_HIGH>;
+				dr_mode = "host";
+				snps,dis_u2_susphy_quirk;
+				snps,quirk-frame-length-adjustment;
+			};
+		};
 	};
 
 	timer {
-- 
2.21.0

[PATCH v3 3/3] arm64: dts: meson: g12a: Add mali-g31 gpu node

[Neil Armstrong]

This patch adds the ARM Mali G31 GPU node.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 27 +++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
index a9cd91f033f2..c762e2309b2b 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12a.dtsi
@@ -433,6 +433,33 @@
 				snps,quirk-frame-length-adjustment;
 			};
 		};
+
+		mali: gpu@ffe40000 {
+			compatible = "amlogic,meson-g12a-mali", "arm,mali-bifrost";
+			reg = <0x0 0xffe40000 0x0 0x40000>;
+			interrupt-parent = <&gic>;
+			interrupts = <GIC_SPI 160 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 161 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "gpu", "mmu", "job";
+			clocks = <&clkc CLKID_MALI>;
+			resets = <&reset RESET_DVALIN_CAPB3>, <&reset RESET_DVALIN>;
+
+			/*
+			 * Mali clocking is provided by two identical clock paths
+			 * MALI_0 and MALI_1 muxed to a single clock by a glitch
+			 * free mux to safely change frequency while running.
+			 */
+			assigned-clocks = <&clkc CLKID_MALI_0_SEL>,
+					  <&clkc CLKID_MALI_0>,
+					  <&clkc CLKID_MALI>; /* Glitch free mux */
+			assigned-clock-parents = <&clkc CLKID_FCLK_DIV2P5>,
+						 <0>, /* Do Nothing */
+						 <&clkc CLKID_MALI_0>;
+			assigned-clock-rates = <0>, /* Do Nothing */
+					       <800000000>,
+					       <0>; /* Do Nothing */
+		};
 	};
 
 	timer {
-- 
2.21.0

Re: [PATCH v3 0/3] arm64: dts: g12a: Add peripherals

[Neil Armstrong]

On 25/03/2019 11:03, Neil Armstrong wrote:
> Add following peripherals :
> - SAR-ADC
> - USB
> - Mali GPU
> 
> Dependencies :
> - ADC
> 
> Depends on CLKID_AO_SAR_ADC_SEL, stable clk headers tags will be
> available after v5.1-rc4
> 
> Bindings has been merged for 5.2-rc1
> 
> - USB
> 
> USB depends on the CLKID_PCIE_PLL, stable clk headers tags will be
> available after v5.1-rc4
> 
> USB2 PHY depends on missing Reset bindings, have been applied to
> reset/fixes, waiting to be merge into master or immutable branch/tag
> 
> Bindings has been Reviewed, waiting to be applied
> 
> - Mali
> 
> No Clk or Reset dependencies
> 
> Mali GPU bindings are still in review.
> 
> Changes since v2 :
> - dropped applied patches
> - collected review tags
> 
> Changes since v1 :
> - dropped already applied "Add AO Secure node"
> - dropped meson-g12a-u200.dts uart_AO change
> - fixed includes overall to fix build for each patches
> - removed disabled status in dwc2 node
> - removed uart_ao_a_c pinctrl
> - fixed uart pinctrl node name
> 
> Neil Armstrong (3):
>   arm64: dts: meson: g12a: Add SAR ADC node
>   arm64: dts: meson: g12a: Add G12A USB nodes
>   arm64: dts: meson: g12a: Add mali-g31 gpu node
> 
>  arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 117 ++++++++++++++++++++
>  1 file changed, 117 insertions(+)
> 

Hi Kevin,

Clock headers bindings stable tag has been sent to the list,
USB PHY Bindings has been applied, USB Glue patches are
still pending.
The Mali Bifrost GPU bindings are still in review.

Neil

Re: [PATCH v3 0/3] arm64: dts: g12a: Add peripherals

[Neil Armstrong]

On 01/04/2019 13:51, Neil Armstrong wrote:
> On 25/03/2019 11:03, Neil Armstrong wrote:
>> Add following peripherals :
>> - SAR-ADC
>> - USB
>> - Mali GPU
>>
>> Dependencies :
>> - ADC
>>
>> Depends on CLKID_AO_SAR_ADC_SEL, stable clk headers tags will be
>> available after v5.1-rc4
>>
>> Bindings has been merged for 5.2-rc1
>>
>> - USB
>>
>> USB depends on the CLKID_PCIE_PLL, stable clk headers tags will be
>> available after v5.1-rc4
>>
>> USB2 PHY depends on missing Reset bindings, have been applied to
>> reset/fixes, waiting to be merge into master or immutable branch/tag
>>
>> Bindings has been Reviewed, waiting to be applied
>>
>> - Mali
>>
>> No Clk or Reset dependencies
>>
>> Mali GPU bindings are still in review.
>>
>> Changes since v2 :
>> - dropped applied patches
>> - collected review tags
>>
>> Changes since v1 :
>> - dropped already applied "Add AO Secure node"
>> - dropped meson-g12a-u200.dts uart_AO change
>> - fixed includes overall to fix build for each patches
>> - removed disabled status in dwc2 node
>> - removed uart_ao_a_c pinctrl
>> - fixed uart pinctrl node name
>>
>> Neil Armstrong (3):
>>   arm64: dts: meson: g12a: Add SAR ADC node
>>   arm64: dts: meson: g12a: Add G12A USB nodes
>>   arm64: dts: meson: g12a: Add mali-g31 gpu node
>>
>>  arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 117 ++++++++++++++++++++
>>  1 file changed, 117 insertions(+)
>>
> 
> Hi Kevin,
> 
> Clock headers bindings stable tag has been sent to the list,
> USB PHY Bindings has been applied, USB Glue patches are
> still pending.
> The Mali Bifrost GPU bindings are still in review.
> 
> Neil
> 

The Mali bindings has been applied to drm-misc-next.

The only remaining dependencies are the USB Glue & DWC2 bindings that has been
reviewed, but not yet applied.

Neil

Re: [PATCH v3 0/3] arm64: dts: g12a: Add peripherals

[Kevin Hilman]

Neil Armstrong <narmstrong@baylibre.com> writes:

> On 01/04/2019 13:51, Neil Armstrong wrote:
>> On 25/03/2019 11:03, Neil Armstrong wrote:
>>> Add following peripherals :
>>> - SAR-ADC
>>> - USB
>>> - Mali GPU
>>>
>>> Dependencies :
>>> - ADC
>>>
>>> Depends on CLKID_AO_SAR_ADC_SEL, stable clk headers tags will be
>>> available after v5.1-rc4
>>>
>>> Bindings has been merged for 5.2-rc1
>>>
>>> - USB
>>>
>>> USB depends on the CLKID_PCIE_PLL, stable clk headers tags will be
>>> available after v5.1-rc4
>>>
>>> USB2 PHY depends on missing Reset bindings, have been applied to
>>> reset/fixes, waiting to be merge into master or immutable branch/tag
>>>
>>> Bindings has been Reviewed, waiting to be applied
>>>
>>> - Mali
>>>
>>> No Clk or Reset dependencies
>>>
>>> Mali GPU bindings are still in review.
>>>
>>> Changes since v2 :
>>> - dropped applied patches
>>> - collected review tags
>>>
>>> Changes since v1 :
>>> - dropped already applied "Add AO Secure node"
>>> - dropped meson-g12a-u200.dts uart_AO change
>>> - fixed includes overall to fix build for each patches
>>> - removed disabled status in dwc2 node
>>> - removed uart_ao_a_c pinctrl
>>> - fixed uart pinctrl node name
>>>
>>> Neil Armstrong (3):
>>>   arm64: dts: meson: g12a: Add SAR ADC node
>>>   arm64: dts: meson: g12a: Add G12A USB nodes
>>>   arm64: dts: meson: g12a: Add mali-g31 gpu node
>>>
>>>  arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 117 ++++++++++++++++++++
>>>  1 file changed, 117 insertions(+)
>>>
>> 
>> Hi Kevin,
>> 
>> Clock headers bindings stable tag has been sent to the list,
>> USB PHY Bindings has been applied, USB Glue patches are
>> still pending.
>> The Mali Bifrost GPU bindings are still in review.
>> 
>> Neil
>> 
>
> The Mali bindings has been applied to drm-misc-next.
>
> The only remaining dependencies are the USB Glue & DWC2 bindings that has been
> reviewed, but not yet applied.

OK, those don't cause any build/boot time dependencies, so I'll queue up
this series for v5.2.

Thanks,

Kevin