Commit d373605c authored by Philipp Zabel's avatar Philipp Zabel
Browse files

Merge tag 'reset-fixes-for-v7.0-2' into reset/next 



Reset controller fixes for v7.0, part 2

* Decouple spacemit K3 reset lines that were incorrectly coupled
  together as one, but are in fact separate resets in hardware.
* Fix a double free in the reset_add_gpio_aux_device() error path.
  This has already been fixed on reset/next by commit a9b95ce3
  ("reset: gpio: add a devlink between reset-gpio and its consumer").
* Fix the MODULE_AUTHOR string in the rzg2l-usbphy-ctrl driver.

We merge this into reset/next to resolve a conflict between commits
a9b95ce3 ("reset: gpio: add a devlink between reset-gpio and its
consumer") and fbffb8c7 ("reset: gpio: fix double free in
reset_add_gpio_aux_device() error path").

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parents f62fcdf8 a0e0c2f8

drivers/reset/reset-rzg2l-usbphy-ctrl.c

+4 −1
Original line number Diff line number Diff line
@@ -136,6 +136,9 @@ static int rzg2l_usbphy_ctrl_set_pwrrdy(struct regmap_field *pwrrdy, 
{

	u32 val = power_on ? 0 : 1;



	if (!pwrrdy)

		return 0;



	/* The initialization path guarantees that the mask is 1 bit long. */

	return regmap_field_update_bits(pwrrdy, 1, val);

}
@@ -347,4 +350,4 @@ module_platform_driver(rzg2l_usbphy_ctrl_driver); 


MODULE_LICENSE("GPL v2");

MODULE_DESCRIPTION("Renesas RZ/G2L USBPHY Control");

MODULE_AUTHOR("biju.das.jz@bp.renesas.com>");
 
MODULE_AUTHOR("Biju Das <biju.das.jz@bp.renesas.com>");

drivers/reset/spacemit/reset-spacemit-k3.c

+36 −24
Original line number Diff line number Diff line
@@ -112,16 +112,21 @@ static const struct ccu_reset_data k3_apmu_resets[] = { 
	[RESET_APMU_SDH0]	= RESET_DATA(APMU_SDH0_CLK_RES_CTRL,	0, BIT(1)),

	[RESET_APMU_SDH1]	= RESET_DATA(APMU_SDH1_CLK_RES_CTRL,	0, BIT(1)),

	[RESET_APMU_SDH2]	= RESET_DATA(APMU_SDH2_CLK_RES_CTRL,	0, BIT(1)),

	[RESET_APMU_USB2]	= RESET_DATA(APMU_USB_CLK_RES_CTRL,	0,

				BIT(1)|BIT(2)|BIT(3)),

	[RESET_APMU_USB3_PORTA]	= RESET_DATA(APMU_USB_CLK_RES_CTRL,	0,

				BIT(5)|BIT(6)|BIT(7)),

	[RESET_APMU_USB3_PORTB]	= RESET_DATA(APMU_USB_CLK_RES_CTRL,	0,

				BIT(9)|BIT(10)|BIT(11)),

	[RESET_APMU_USB3_PORTC]	= RESET_DATA(APMU_USB_CLK_RES_CTRL,	0,

				BIT(13)|BIT(14)|BIT(15)),

	[RESET_APMU_USB3_PORTD]	= RESET_DATA(APMU_USB_CLK_RES_CTRL,	0,

				BIT(17)|BIT(18)|BIT(19)),

	[RESET_APMU_USB2_AHB]	= RESET_DATA(APMU_USB_CLK_RES_CTRL,	0, BIT(1)),

	[RESET_APMU_USB2_VCC]	= RESET_DATA(APMU_USB_CLK_RES_CTRL,	0, BIT(2)),

	[RESET_APMU_USB2_PHY]	= RESET_DATA(APMU_USB_CLK_RES_CTRL,	0, BIT(3)),

	[RESET_APMU_USB3_A_AHB]	= RESET_DATA(APMU_USB_CLK_RES_CTRL,	0, BIT(5)),

	[RESET_APMU_USB3_A_VCC]	= RESET_DATA(APMU_USB_CLK_RES_CTRL,	0, BIT(6)),

	[RESET_APMU_USB3_A_PHY]	= RESET_DATA(APMU_USB_CLK_RES_CTRL,	0, BIT(7)),

	[RESET_APMU_USB3_B_AHB]	= RESET_DATA(APMU_USB_CLK_RES_CTRL,	0, BIT(9)),

	[RESET_APMU_USB3_B_VCC]	= RESET_DATA(APMU_USB_CLK_RES_CTRL,	0, BIT(10)),

	[RESET_APMU_USB3_B_PHY]	= RESET_DATA(APMU_USB_CLK_RES_CTRL,	0, BIT(11)),

	[RESET_APMU_USB3_C_AHB]	= RESET_DATA(APMU_USB_CLK_RES_CTRL,	0, BIT(13)),

	[RESET_APMU_USB3_C_VCC]	= RESET_DATA(APMU_USB_CLK_RES_CTRL,	0, BIT(14)),

	[RESET_APMU_USB3_C_PHY]	= RESET_DATA(APMU_USB_CLK_RES_CTRL,	0, BIT(15)),

	[RESET_APMU_USB3_D_AHB]	= RESET_DATA(APMU_USB_CLK_RES_CTRL,	0, BIT(17)),

	[RESET_APMU_USB3_D_VCC]	= RESET_DATA(APMU_USB_CLK_RES_CTRL,	0, BIT(18)),

	[RESET_APMU_USB3_D_PHY]	= RESET_DATA(APMU_USB_CLK_RES_CTRL,	0, BIT(19)),

	[RESET_APMU_QSPI]	= RESET_DATA(APMU_QSPI_CLK_RES_CTRL,	0, BIT(1)),

	[RESET_APMU_QSPI_BUS]	= RESET_DATA(APMU_QSPI_CLK_RES_CTRL,	0, BIT(0)),

	[RESET_APMU_DMA]	= RESET_DATA(APMU_DMA_CLK_RES_CTRL,	0, BIT(0)),
@@ -151,10 +156,12 @@ static const struct ccu_reset_data k3_apmu_resets[] = { 
	[RESET_APMU_CPU7_SW]	= RESET_DATA(APMU_PMU_CC2_AP,		BIT(26), 0),

	[RESET_APMU_C1_MPSUB_SW]	= RESET_DATA(APMU_PMU_CC2_AP,	BIT(28), 0),

	[RESET_APMU_MPSUB_DBG]	= RESET_DATA(APMU_PMU_CC2_AP,		BIT(29), 0),

	[RESET_APMU_UCIE]	= RESET_DATA(APMU_UCIE_CTRL,

				BIT(1) | BIT(2) | BIT(3), 0),

	[RESET_APMU_RCPU]	= RESET_DATA(APMU_RCPU_CLK_RES_CTRL,	0,

				BIT(3) | BIT(2) | BIT(0)),

	[RESET_APMU_UCIE_IP]	= RESET_DATA(APMU_UCIE_CTRL,		BIT(1),  0),

	[RESET_APMU_UCIE_HOT]	= RESET_DATA(APMU_UCIE_CTRL,		BIT(2),  0),

	[RESET_APMU_UCIE_MON]	= RESET_DATA(APMU_UCIE_CTRL,		BIT(3),  0),

	[RESET_APMU_RCPU_AUDIO_SYS]	= RESET_DATA(APMU_RCPU_CLK_RES_CTRL,	0, BIT(0)),

	[RESET_APMU_RCPU_MCU_CORE]	= RESET_DATA(APMU_RCPU_CLK_RES_CTRL,	0, BIT(2)),

	[RESET_APMU_RCPU_AUDIO_APMU]	= RESET_DATA(APMU_RCPU_CLK_RES_CTRL,	0, BIT(3)),

	[RESET_APMU_DSI4LN2_ESCCLK]	= RESET_DATA(APMU_LCD_CLK_RES_CTRL3,	0, BIT(3)),

	[RESET_APMU_DSI4LN2_LCD_SW]	= RESET_DATA(APMU_LCD_CLK_RES_CTRL3,	0, BIT(4)),

	[RESET_APMU_DSI4LN2_LCD_MCLK]	= RESET_DATA(APMU_LCD_CLK_RES_CTRL4,	0, BIT(9)),
@@ -164,16 +171,21 @@ static const struct ccu_reset_data k3_apmu_resets[] = { 
	[RESET_APMU_UFS_ACLK]	= RESET_DATA(APMU_UFS_CLK_RES_CTRL,	0, BIT(0)),

	[RESET_APMU_EDP0]	= RESET_DATA(APMU_LCD_EDP_CTRL,		0, BIT(0)),

	[RESET_APMU_EDP1]	= RESET_DATA(APMU_LCD_EDP_CTRL,		0, BIT(16)),

	[RESET_APMU_PCIE_PORTA]	= RESET_DATA(APMU_PCIE_CLK_RES_CTRL_A,	0,

				BIT(5) | BIT(4) | BIT(3)),

	[RESET_APMU_PCIE_PORTB]	= RESET_DATA(APMU_PCIE_CLK_RES_CTRL_B,	0,

				BIT(5) | BIT(4) | BIT(3)),

	[RESET_APMU_PCIE_PORTC]	= RESET_DATA(APMU_PCIE_CLK_RES_CTRL_C,	0,

				BIT(5) | BIT(4) | BIT(3)),

	[RESET_APMU_PCIE_PORTD]	= RESET_DATA(APMU_PCIE_CLK_RES_CTRL_D,	0,

				BIT(5) | BIT(4) | BIT(3)),

	[RESET_APMU_PCIE_PORTE]	= RESET_DATA(APMU_PCIE_CLK_RES_CTRL_E,	0,

				BIT(5) | BIT(4) | BIT(3)),

	[RESET_APMU_PCIE_A_DBI]		= RESET_DATA(APMU_PCIE_CLK_RES_CTRL_A,	0, BIT(3)),

	[RESET_APMU_PCIE_A_SLAVE]	= RESET_DATA(APMU_PCIE_CLK_RES_CTRL_A,	0, BIT(4)),

	[RESET_APMU_PCIE_A_MASTER]	= RESET_DATA(APMU_PCIE_CLK_RES_CTRL_A,	0, BIT(5)),

	[RESET_APMU_PCIE_B_DBI]		= RESET_DATA(APMU_PCIE_CLK_RES_CTRL_B,	0, BIT(3)),

	[RESET_APMU_PCIE_B_SLAVE]	= RESET_DATA(APMU_PCIE_CLK_RES_CTRL_B,	0, BIT(4)),

	[RESET_APMU_PCIE_B_MASTER]	= RESET_DATA(APMU_PCIE_CLK_RES_CTRL_B,	0, BIT(5)),

	[RESET_APMU_PCIE_C_DBI]		= RESET_DATA(APMU_PCIE_CLK_RES_CTRL_C,	0, BIT(3)),

	[RESET_APMU_PCIE_C_SLAVE]	= RESET_DATA(APMU_PCIE_CLK_RES_CTRL_C,	0, BIT(4)),

	[RESET_APMU_PCIE_C_MASTER]	= RESET_DATA(APMU_PCIE_CLK_RES_CTRL_C,	0, BIT(5)),

	[RESET_APMU_PCIE_D_DBI]		= RESET_DATA(APMU_PCIE_CLK_RES_CTRL_D,	0, BIT(3)),

	[RESET_APMU_PCIE_D_SLAVE]	= RESET_DATA(APMU_PCIE_CLK_RES_CTRL_D,	0, BIT(4)),

	[RESET_APMU_PCIE_D_MASTER]	= RESET_DATA(APMU_PCIE_CLK_RES_CTRL_D,	0, BIT(5)),

	[RESET_APMU_PCIE_E_DBI]		= RESET_DATA(APMU_PCIE_CLK_RES_CTRL_E,	0, BIT(3)),

	[RESET_APMU_PCIE_E_SLAVE]	= RESET_DATA(APMU_PCIE_CLK_RES_CTRL_E,	0, BIT(4)),

	[RESET_APMU_PCIE_E_MASTER]	= RESET_DATA(APMU_PCIE_CLK_RES_CTRL_E,	0, BIT(5)),

	[RESET_APMU_EMAC0]	= RESET_DATA(APMU_EMAC0_CLK_RES_CTRL,	0, BIT(1)),

	[RESET_APMU_EMAC1]	= RESET_DATA(APMU_EMAC1_CLK_RES_CTRL,	0, BIT(1)),

	[RESET_APMU_EMAC2]	= RESET_DATA(APMU_EMAC2_CLK_RES_CTRL,	0, BIT(1)),

include/dt-bindings/reset/spacemit,k3-resets.h

+36 −12
Original line number Diff line number Diff line
@@ -97,11 +97,11 @@ 
#define RESET_APMU_SDH0          13

#define RESET_APMU_SDH1          14

#define RESET_APMU_SDH2          15

#define RESET_APMU_USB2          16

#define RESET_APMU_USB3_PORTA    17

#define RESET_APMU_USB3_PORTB    18

#define RESET_APMU_USB3_PORTC    19

#define RESET_APMU_USB3_PORTD    20

#define RESET_APMU_USB2_AHB      16

#define RESET_APMU_USB2_VCC      17

#define RESET_APMU_USB2_PHY      18

#define RESET_APMU_USB3_A_AHB    19

#define RESET_APMU_USB3_A_VCC    20

#define RESET_APMU_QSPI          21

#define RESET_APMU_QSPI_BUS      22

#define RESET_APMU_DMA           23
@@ -132,8 +132,8 @@ 
#define RESET_APMU_CPU7_SW       48

#define RESET_APMU_C1_MPSUB_SW   49

#define RESET_APMU_MPSUB_DBG     50

#define RESET_APMU_UCIE          51

#define RESET_APMU_RCPU          52

#define RESET_APMU_USB3_A_PHY    51	/* USB3 A */

#define RESET_APMU_USB3_B_AHB    52

#define RESET_APMU_DSI4LN2_ESCCLK     53

#define RESET_APMU_DSI4LN2_LCD_SW     54

#define RESET_APMU_DSI4LN2_LCD_MCLK   55
@@ -143,16 +143,40 @@ 
#define RESET_APMU_UFS_ACLK      59

#define RESET_APMU_EDP0          60

#define RESET_APMU_EDP1          61

#define RESET_APMU_PCIE_PORTA    62

#define RESET_APMU_PCIE_PORTB    63

#define RESET_APMU_PCIE_PORTC    64

#define RESET_APMU_PCIE_PORTD    65

#define RESET_APMU_PCIE_PORTE    66

#define RESET_APMU_USB3_B_VCC    62	/* USB3 B */

#define RESET_APMU_USB3_B_PHY    63

#define RESET_APMU_USB3_C_AHB    64

#define RESET_APMU_USB3_C_VCC    65

#define RESET_APMU_USB3_C_PHY    66

#define RESET_APMU_EMAC0         67

#define RESET_APMU_EMAC1         68

#define RESET_APMU_EMAC2         69

#define RESET_APMU_ESPI_MCLK     70

#define RESET_APMU_ESPI_SCLK     71

#define RESET_APMU_USB3_D_AHB    72	/* USB3 D */

#define RESET_APMU_USB3_D_VCC    73

#define RESET_APMU_USB3_D_PHY    74

#define RESET_APMU_UCIE_IP       75

#define RESET_APMU_UCIE_HOT      76

#define RESET_APMU_UCIE_MON      77

#define RESET_APMU_RCPU_AUDIO_SYS     78

#define RESET_APMU_RCPU_MCU_CORE      79

#define RESET_APMU_RCPU_AUDIO_APMU    80

#define RESET_APMU_PCIE_A_DBI    81

#define RESET_APMU_PCIE_A_SLAVE  82

#define RESET_APMU_PCIE_A_MASTER 83

#define RESET_APMU_PCIE_B_DBI    84

#define RESET_APMU_PCIE_B_SLAVE  85

#define RESET_APMU_PCIE_B_MASTER 86

#define RESET_APMU_PCIE_C_DBI    87

#define RESET_APMU_PCIE_C_SLAVE  88

#define RESET_APMU_PCIE_C_MASTER 89

#define RESET_APMU_PCIE_D_DBI    90

#define RESET_APMU_PCIE_D_SLAVE  91

#define RESET_APMU_PCIE_D_MASTER 92

#define RESET_APMU_PCIE_E_DBI    93

#define RESET_APMU_PCIE_E_SLAVE  94

#define RESET_APMU_PCIE_E_MASTER 95



/* DCIU resets*/

#define RESET_DCIU_HDMA          0