diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2017-01-11 19:00:03 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2017-01-11 19:00:03 +0100 |
| commit | e05529dd8b582c4421938066a5ff5006452ced78 (patch) | |
| tree | b4e925b08f2f672c6331db06c4b1986e58f89a75 /arch/arm/dts | |
| parent | 0c3f4d1da2277ac0cb88dc32ac0de48bc241e01f (diff) | |
| parent | 9563a024d28c0f35db8fc459931f4909bbffe5eb (diff) | |
| download | barebox-e05529dd8b582c4421938066a5ff5006452ced78.tar.gz barebox-e05529dd8b582c4421938066a5ff5006452ced78.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch/arm/dts')
| -rw-r--r-- | arch/arm/dts/imx53-guf-vincell-lt.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/imx53-guf-vincell.dts | 2 | ||||
| -rw-r--r-- | arch/arm/dts/socfpga.dtsi | 11 |
3 files changed, 2 insertions, 13 deletions
diff --git a/arch/arm/dts/imx53-guf-vincell-lt.dts b/arch/arm/dts/imx53-guf-vincell-lt.dts index 67a41332f5..2b1b54acc5 100644 --- a/arch/arm/dts/imx53-guf-vincell-lt.dts +++ b/arch/arm/dts/imx53-guf-vincell-lt.dts @@ -152,7 +152,7 @@ }; pmic: dialog@48 { /* DA9053-3HHA1 PMIC */ - compatible = "dialog,da9053-aa", "dialog,da9052"; + compatible = "dlg,da9053-aa", "dlg,da9052"; reg = <0x48>; interrupt-parent = <&gpio7>; interrupts = <12 IRQ_TYPE_LEVEL_LOW>; diff --git a/arch/arm/dts/imx53-guf-vincell.dts b/arch/arm/dts/imx53-guf-vincell.dts index 2f0153e7b2..f743f171d6 100644 --- a/arch/arm/dts/imx53-guf-vincell.dts +++ b/arch/arm/dts/imx53-guf-vincell.dts @@ -102,7 +102,7 @@ status = "okay"; pmic: dialog@48 { /* DA9053-3HHA1 PMIC */ - compatible = "dialog,da9053-aa", "dialog,da9052"; + compatible = "dlg,da9053-aa", "dlg,da9052"; reg = <0x48>; interrupt-parent = <&gpio7>; interrupts = <12 IRQ_TYPE_LEVEL_LOW>; diff --git a/arch/arm/dts/socfpga.dtsi b/arch/arm/dts/socfpga.dtsi index 5b141c2391..274c491804 100644 --- a/arch/arm/dts/socfpga.dtsi +++ b/arch/arm/dts/socfpga.dtsi @@ -25,17 +25,6 @@ clock-names = "qspi_clk"; status = "disabled"; }; - - fpgamgr@ff706000 { - compatible = "altr,socfpga-fpga-mgr"; - reg = <0xff706000 0x1000>, - <0xffb90000 0x1000>; - }; - - system_mgr: sysmgr@ffd08000 { - compatible = "altr,sys-mgr", "syscon"; - reg = <0xffd08000 0x4000>; - }; }; }; &osc2 { |