mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-05-12 18:35:35 -04:00
Merge tag 'hisi-arm64-dt-for-6.8' of https://github.com/hisilicon/linux-hisi into soc/dt
ARM64: DT: HiSilicon ARM64 DT updates for v6.8 - Merge the hi3620-clock binding into hisilicon,sysctrl - Clean up the hikey970 PMIC dtsi * tag 'hisi-arm64-dt-for-6.8' of https://github.com/hisilicon/linux-hisi: arm64: dts: hisilicon: hikey970-pmic: clean up SPMI node arm64: dts: hisilicon: hikey970-pmic: fix regulator cells properties dt-bindings: hisilicon: Merge hi3620-clock into hisilicon,sysctrl binding Link: https://lore.kernel.org/r/6572C4C8.6050401@hisilicon.com Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
@@ -82,6 +82,23 @@ properties:
|
||||
|
||||
ranges: true
|
||||
|
||||
patternProperties:
|
||||
'^clock@':
|
||||
type: object
|
||||
additionalProperties: false
|
||||
|
||||
properties:
|
||||
compatible:
|
||||
enum:
|
||||
- hisilicon,hi3620-clock
|
||||
- hisilicon,hi3620-mmc-clock
|
||||
|
||||
reg:
|
||||
maxItems: 1
|
||||
|
||||
'#clock-cells':
|
||||
const: 1
|
||||
|
||||
required:
|
||||
- compatible
|
||||
- reg
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
* Hisilicon Hi3620 Clock Controller
|
||||
|
||||
The Hi3620 clock controller generates and supplies clock to various
|
||||
controllers within the Hi3620 SoC.
|
||||
|
||||
Required Properties:
|
||||
|
||||
- compatible: should be one of the following.
|
||||
- "hisilicon,hi3620-clock" - controller compatible with Hi3620 SoC.
|
||||
- "hisilicon,hi3620-mmc-clock" - controller specific for Hi3620 mmc.
|
||||
|
||||
- reg: physical base address of the controller and length of memory mapped
|
||||
region.
|
||||
|
||||
- #clock-cells: should be 1.
|
||||
|
||||
Each clock is assigned an identifier and client nodes use this identifier
|
||||
to specify the clock which they consume.
|
||||
|
||||
All these identifier could be found in <dt-bindings/clock/hi3620-clock.h>.
|
||||
@@ -10,10 +10,9 @@
|
||||
/ {
|
||||
spmi: spmi@fff24000 {
|
||||
compatible = "hisilicon,kirin970-spmi-controller";
|
||||
reg = <0x0 0xfff24000 0x0 0x1000>;
|
||||
#address-cells = <2>;
|
||||
#size-cells = <0>;
|
||||
status = "okay";
|
||||
reg = <0x0 0xfff24000 0x0 0x1000>;
|
||||
hisilicon,spmi-channel = <2>;
|
||||
|
||||
pmic: pmic@0 {
|
||||
@@ -25,9 +24,6 @@ pmic: pmic@0 {
|
||||
gpios = <&gpio28 0 0>;
|
||||
|
||||
regulators {
|
||||
#address-cells = <1>;
|
||||
#size-cells = <0>;
|
||||
|
||||
ldo3: ldo3 { /* HDMI */
|
||||
regulator-name = "ldo3";
|
||||
regulator-min-microvolt = <1500000>;
|
||||
|
||||
Reference in New Issue
Block a user