Commit c3d68019 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'ux500-armsoc-v5.6-1' of... 

Merge tag 'ux500-armsoc-v5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into arm/dt

First set of Ux500 DTS changes for the v5.6 kernel:

- Add the GPADC IIO channels
- Factor out generic pin configuration
- Add the gpio_in_nopull configuration
- Tighten up I2C and SPI buses
- Clean up some compatibles
- Extract a generic DB8500 DTSI
- Add HREF520 DTS and the associated DB8520 DTSI
- Split TVK R2 and R3 to separate DTSI files

* tag 'ux500-armsoc-v5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: dts: ux500: Add devicetree for HREF520
  ARM: dts: ux500: Split TVK DTSI files in two
  ARM: dts: ux500: Break out DB8500 DTSI
  ARM: dts: ux500: Drop pulls on I2C buses
  ARM: dts: ux500: Use "arm,pl031" compatible for PL031
  ARM: dts: ux500: Add "simple-bus" compatible to soc node
  ARM: dts: ux500: Remove ux500_ prefix from ux500_serial* labels
  ARM: dts: ux500: Move serial aliases to ste-dbx5x0.dtsi
  ARM: dts: ux500: Add aliases for I2C and SPI buses
  ARM: dts: ux500: Disable I2C/SPI buses by default
  ARM: dts: ux500: nomadik-pinctrl: Add &gpio_in_nopull
  ARM: dts: ux500: Add pin configs for UART1 CTS/RTS pins
  ARM: dts: ux500: Add alternative SDI pin configs
  ARM: dts: ux500: Rename generic pin configs according to pin group
  ARM: dts: ux500: Move generic pin configs out of ste-href-family-pinctrl.dtsi
  dt-bindings: arm: Document compatibles for Ux500 boards
  ARM: dts: ux500: snowball: Remove unused PRCMU cpufreq node
  ARM: dts: ux500: declare GPADC IIO ADC channels

Link: https://lore.kernel.org/r/CACRpkdYfqJ=VXkP3Qm5Lw63AuR=1ChxbUW+Y-nhw5gCX6sYfDw@mail.gmail.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e691c23e 42a1e945

Documentation/devicetree/bindings/arm/ux500.yaml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

%YAML 1.2

---

$id: http://devicetree.org/schemas/arm/ux500.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Ux500 platforms device tree bindings



maintainers:

  - Linus Walleij <linus.walleij@linaro.org>



properties:

  $nodename:

    const: '/'

  compatible:

    oneOf:



      - description: ST-Ericsson HREF (pre-v60)

        items:

          - const: st-ericsson,mop500

          - const: st-ericsson,u8500



      - description: ST-Ericsson HREF (v60+)

        items:

          - const: st-ericsson,hrefv60+

          - const: st-ericsson,u8500



      - description: Calao Systems Snowball

        items:

          - const: calaosystems,snowball-a9500

          - const: st-ericsson,u9500

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -2058,6 +2058,7 @@ F: drivers/rtc/rtc-pl031.c 
F:	drivers/watchdog/coh901327_wdt.c

F:	Documentation/devicetree/bindings/arm/ste-*

F:	Documentation/devicetree/bindings/arm/ux500/

F:	Documentation/devicetree/bindings/arm/ux500.yaml

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git









ARM/NUVOTON NPCM ARCHITECTURE


































arch/arm/boot/dts/Makefile



+2
−1






























Original line number
Diff line number
Diff line







@@ -1182,7 +1182,8 @@ dtb-$(CONFIG_ARCH_U8500) += \







	ste-hrefprev60-stuib.dtb \









	ste-hrefprev60-tvk.dtb \









	ste-hrefv60plus-stuib.dtb \









	ste-hrefv60plus-tvk.dtb









	ste-hrefv60plus-tvk.dtb \









	ste-href520-tvk.dtb









dtb-$(CONFIG_ARCH_UNIPHIER) += \









	uniphier-ld4-ref.dtb \









	uniphier-ld6b-ref.dtb \


































arch/arm/boot/dts/ste-ab8500.dtsi



+101
−1






























Original line number
Diff line number
Diff line







@@ -6,6 +6,20 @@







#include <dt-bindings/clock/ste-ab8500.h>



















/ {









	/* Essential housekeeping hardware monitors */









	iio-hwmon {









		compatible = "iio-hwmon";









		io-channels = <&gpadc 0x02>, /* Battery temperature */









			    <&gpadc 0x03>, /* Main charger voltage */









			    <&gpadc 0x08>, /* Main battery voltage */









			    <&gpadc 0x09>, /* VBUS */









			    <&gpadc 0x0a>, /* Main charger current */









			    <&gpadc 0x0b>, /* USB charger current */









			    <&gpadc 0x0c>, /* Backup battery voltage */









			    <&gpadc 0x0d>, /* Die temperature */









			    <&gpadc 0x12>; /* Crystal temperature */









	};



















	soc {









		prcmu@80157000 {









			ab8500 {










@@ -33,12 +47,84 @@ ab8500-rtc {







					interrupt-names = "60S", "ALARM";









				};



















				ab8500-gpadc {









				gpadc: ab8500-gpadc {









					compatible = "stericsson,ab8500-gpadc";









					interrupts = <32 IRQ_TYPE_LEVEL_HIGH









						      39 IRQ_TYPE_LEVEL_HIGH>;









					interrupt-names = "HW_CONV_END", "SW_CONV_END";









					vddadc-supply = <&ab8500_ldo_tvout_reg>;









					#address-cells = <1>;









					#size-cells = <0>;









					#io-channel-cells = <1>;



















					/* GPADC channels */









					bat_ctrl: channel@01 {









						reg = <0x01>;









					};









					btemp_ball: channel@02 {









						reg = <0x02>;









					};









					main_charger_v: channel@03 {









						reg = <0x03>;









					};









					acc_detect1: channel@04 {









						reg = <0x04>;









					};









					acc_detect2: channel@05 {









						reg = <0x05>;









					};









					adc_aux1: channel@06 {









						reg = <0x06>;









					};









					adc_aux2: channel@07 {









						reg = <0x07>;









					};









					main_batt_v: channel@08 {









						reg = <0x08>;









					};









					vbus_v: channel@09 {









						reg = <0x09>;









					};









					main_charger_c: channel@0a {









						reg = <0x0a>;









					};









					usb_charger_c: channel@0b {









						reg = <0x0b>;









					};









					bk_bat_v: channel@0c {









						reg = <0x0c>;









					};









					die_temp: channel@0d {









						reg = <0x0d>;









					};









					usb_id: channel@0e {









						reg = <0x0e>;









					};









					xtal_temp: channel@12 {









						reg = <0x12>;









					};









					vbat_true_meas: channel@13 {









						reg = <0x13>;









					};









					bat_ctrl_and_ibat: channel@1c {









						reg = <0x1c>;









					};









					vbat_meas_and_ibat: channel@1d {









						reg = <0x1d>;









					};









					vbat_true_meas_and_ibat: channel@1e {









						reg = <0x1e>;









					};









					bat_temp_and_ibat: channel@1f {









						reg = <0x1f>;









					};









				};



















				ab8500_temp {









					compatible = "stericsson,abx500-temp";









					io-channels = <&gpadc 0x06>,









						      <&gpadc 0x07>;









					io-channel-name = "aux1", "aux2";









				};



















				ab8500_battery: ab8500_battery {










@@ -49,17 +135,31 @@ ab8500_battery: ab8500_battery {







				ab8500_fg {









					compatible = "stericsson,ab8500-fg";









					battery	   = <&ab8500_battery>;









					io-channels = <&gpadc 0x08>;









					io-channel-name = "main_bat_v";









				};



















				ab8500_btemp {









					compatible = "stericsson,ab8500-btemp";









					battery	   = <&ab8500_battery>;









					io-channels = <&gpadc 0x02>,









						      <&gpadc 0x01>;









					io-channel-name = "btemp_ball",









							"bat_ctrl";









				};



















				ab8500_charger {









					compatible	= "stericsson,ab8500-charger";









					battery		= <&ab8500_battery>;









					vddadc-supply	= <&ab8500_ldo_tvout_reg>;









					io-channels = <&gpadc 0x03>,









						      <&gpadc 0x0a>,









						      <&gpadc 0x09>,









						      <&gpadc 0x0b>;









					io-channel-name = "main_charger_v",









							"main_charger_c",









							"vbus_v",









							"usb_charger_c";









				};



















				ab8500_chargalg {


































arch/arm/boot/dts/ste-db8500.dtsi
0 → 100644



+15
−0






























Original line number
Diff line number
Diff line









// SPDX-License-Identifier: GPL-2.0-or-later



















#include "ste-dbx5x0.dtsi"



















/ {









	cpus {









		cpu@300 {









			/* cpufreq controls */









			operating-points = <998400 0









					    800000 0









					    400000 0









					    200000 0>;









		};









	};









};