From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carlo Caione Subject: [PATCH v3 1/2] ARM: dts: amlogic: Split pinctrl device for Meson8 / Meson8b Date: Wed, 23 Mar 2016 10:13:59 +0100 Message-ID: <1458724440-32228-2-git-send-email-carlo@caione.org> References: <1458724440-32228-1-git-send-email-carlo@caione.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: In-Reply-To: <1458724440-32228-1-git-send-email-carlo-KA+7E9HrN00dnm+yROfE0A@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-6IF/jdPJHihWk0Htik3J/w@public.gmane.org, linux-meson-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org, afaerber-l3A5Bk7waGM@public.gmane.org, robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org, khilman-rdvid1DuHRBWk0Htik3J/w@public.gmane.org, pawel.moll-5wv7dgnIgG8@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org Cc: Carlo Caione List-Id: devicetree@vger.kernel.org =46rom: Carlo Caione Signed-off-by: Carlo Caione Reviewed-by: Andreas F=C3=A4rber --- arch/arm/boot/dts/meson8.dtsi | 57 ++++++++++++++++++++++++----------= -------- arch/arm/boot/dts/meson8b.dtsi | 12 +++++++-- 2 files changed, 42 insertions(+), 27 deletions(-) diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.d= tsi index a2ddcb8..45619f6 100644 --- a/arch/arm/boot/dts/meson8.dtsi +++ b/arch/arm/boot/dts/meson8.dtsi @@ -91,8 +91,8 @@ clock-frequency =3D <141666666>; }; =20 - pinctrl: pinctrl@c1109880 { - compatible =3D "amlogic,meson8-pinctrl"; + pinctrl_cbus: pinctrl@c1109880 { + compatible =3D "amlogic,meson8-cbus-pinctrl"; reg =3D <0xc1109880 0x10>; #address-cells =3D <1>; #size-cells =3D <1>; @@ -108,29 +108,6 @@ #gpio-cells =3D <2>; }; =20 - gpio_ao: ao-bank@c1108030 { - reg =3D <0xc8100014 0x4>, - <0xc810002c 0x4>, - <0xc8100024 0x8>; - reg-names =3D "mux", "pull", "gpio"; - gpio-controller; - #gpio-cells =3D <2>; - }; - - uart_ao_a_pins: uart_ao_a { - mux { - groups =3D "uart_tx_ao_a", "uart_rx_ao_a"; - function =3D "uart_ao"; - }; - }; - - i2c_ao_pins: i2c_mst_ao { - mux { - groups =3D "i2c_mst_sck_ao", "i2c_mst_sda_ao"; - function =3D "i2c_mst_ao"; - }; - }; - spi_nor_pins: nor { mux { groups =3D "nor_d", "nor_q", "nor_c", "nor_cs"; @@ -157,4 +134,34 @@ }; }; =20 + pinctrl_aobus: pinctrl@c8100084 { + compatible =3D "amlogic,meson8-aobus-pinctrl"; + reg =3D <0xc8100084 0xc>; + #address-cells =3D <1>; + #size-cells =3D <1>; + ranges; + + gpio_ao: ao-bank@c1108030 { + reg =3D <0xc8100014 0x4>, + <0xc810002c 0x4>, + <0xc8100024 0x8>; + reg-names =3D "mux", "pull", "gpio"; + gpio-controller; + #gpio-cells =3D <2>; + }; + + uart_ao_a_pins: uart_ao_a { + mux { + groups =3D "uart_tx_ao_a", "uart_rx_ao_a"; + function =3D "uart_ao"; + }; + }; + + i2c_ao_pins: i2c_mst_ao { + mux { + groups =3D "i2c_mst_sck_ao", "i2c_mst_sda_ao"; + function =3D "i2c_mst_ao"; + }; + }; + }; }; /* end of / */ diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b= =2Edtsi index 8bad557..2bfe401 100644 --- a/arch/arm/boot/dts/meson8b.dtsi +++ b/arch/arm/boot/dts/meson8b.dtsi @@ -155,8 +155,8 @@ reg =3D <0xc1108000 0x4>, <0xc1104000 0x460>; }; =20 - pinctrl: pinctrl@c1109880 { - compatible =3D "amlogic,meson8b-pinctrl"; + pinctrl_cbus: pinctrl@c1109880 { + compatible =3D "amlogic,meson8b-cbus-pinctrl"; reg =3D <0xc1109880 0x10>; #address-cells =3D <1>; #size-cells =3D <1>; @@ -171,6 +171,14 @@ gpio-controller; #gpio-cells =3D <2>; }; + }; + + pinctrl_aobus: pinctrl@c8100084 { + compatible =3D "amlogic,meson8b-aobus-pinctrl"; + reg =3D <0xc8100084 0xc>; + #address-cells =3D <1>; + #size-cells =3D <1>; + ranges; =20 gpio_ao: ao-bank@c1108030 { reg =3D <0xc8100014 0x4>, --=20 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" i= n the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 From: carlo@caione.org (Carlo Caione) Date: Wed, 23 Mar 2016 10:13:59 +0100 Subject: [PATCH v3 1/2] ARM: dts: amlogic: Split pinctrl device for Meson8 / Meson8b In-Reply-To: <1458724440-32228-1-git-send-email-carlo@caione.org> References: <1458724440-32228-1-git-send-email-carlo@caione.org> Message-ID: <1458724440-32228-2-git-send-email-carlo@caione.org> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org From: Carlo Caione Signed-off-by: Carlo Caione Reviewed-by: Andreas F?rber --- arch/arm/boot/dts/meson8.dtsi | 57 ++++++++++++++++++++++++------------------ arch/arm/boot/dts/meson8b.dtsi | 12 +++++++-- 2 files changed, 42 insertions(+), 27 deletions(-) diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi index a2ddcb8..45619f6 100644 --- a/arch/arm/boot/dts/meson8.dtsi +++ b/arch/arm/boot/dts/meson8.dtsi @@ -91,8 +91,8 @@ clock-frequency = <141666666>; }; - pinctrl: pinctrl at c1109880 { - compatible = "amlogic,meson8-pinctrl"; + pinctrl_cbus: pinctrl at c1109880 { + compatible = "amlogic,meson8-cbus-pinctrl"; reg = <0xc1109880 0x10>; #address-cells = <1>; #size-cells = <1>; @@ -108,29 +108,6 @@ #gpio-cells = <2>; }; - gpio_ao: ao-bank at c1108030 { - reg = <0xc8100014 0x4>, - <0xc810002c 0x4>, - <0xc8100024 0x8>; - reg-names = "mux", "pull", "gpio"; - gpio-controller; - #gpio-cells = <2>; - }; - - uart_ao_a_pins: uart_ao_a { - mux { - groups = "uart_tx_ao_a", "uart_rx_ao_a"; - function = "uart_ao"; - }; - }; - - i2c_ao_pins: i2c_mst_ao { - mux { - groups = "i2c_mst_sck_ao", "i2c_mst_sda_ao"; - function = "i2c_mst_ao"; - }; - }; - spi_nor_pins: nor { mux { groups = "nor_d", "nor_q", "nor_c", "nor_cs"; @@ -157,4 +134,34 @@ }; }; + pinctrl_aobus: pinctrl at c8100084 { + compatible = "amlogic,meson8-aobus-pinctrl"; + reg = <0xc8100084 0xc>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + gpio_ao: ao-bank at c1108030 { + reg = <0xc8100014 0x4>, + <0xc810002c 0x4>, + <0xc8100024 0x8>; + reg-names = "mux", "pull", "gpio"; + gpio-controller; + #gpio-cells = <2>; + }; + + uart_ao_a_pins: uart_ao_a { + mux { + groups = "uart_tx_ao_a", "uart_rx_ao_a"; + function = "uart_ao"; + }; + }; + + i2c_ao_pins: i2c_mst_ao { + mux { + groups = "i2c_mst_sck_ao", "i2c_mst_sda_ao"; + function = "i2c_mst_ao"; + }; + }; + }; }; /* end of / */ diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi index 8bad557..2bfe401 100644 --- a/arch/arm/boot/dts/meson8b.dtsi +++ b/arch/arm/boot/dts/meson8b.dtsi @@ -155,8 +155,8 @@ reg = <0xc1108000 0x4>, <0xc1104000 0x460>; }; - pinctrl: pinctrl at c1109880 { - compatible = "amlogic,meson8b-pinctrl"; + pinctrl_cbus: pinctrl at c1109880 { + compatible = "amlogic,meson8b-cbus-pinctrl"; reg = <0xc1109880 0x10>; #address-cells = <1>; #size-cells = <1>; @@ -171,6 +171,14 @@ gpio-controller; #gpio-cells = <2>; }; + }; + + pinctrl_aobus: pinctrl at c8100084 { + compatible = "amlogic,meson8b-aobus-pinctrl"; + reg = <0xc8100084 0xc>; + #address-cells = <1>; + #size-cells = <1>; + ranges; gpio_ao: ao-bank at c1108030 { reg = <0xc8100014 0x4>, -- 2.5.0